Ubuntu Software Center

Merge lp:~gary-lasker/software-center/lp586623 into lp:software-center

  1. lp586623
  2. Merge into trunk
Proposed by Gary Lasker
Status: Merged
Merged at revision: 814
Proposed branch: lp:~gary-lasker/software-center/lp586623
Merge into: lp:software-center
Diff against target: 24 lines (+3/-1)
2 files modified
debian/changelog (+2/-0)
softwarecenter/backend/aptd.py (+1/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/lp586623
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+26261@code.launchpad.net

Description of the change

Heya Michael, I'm pretty sure this is the correct fix, but I thought it best you take a look at it to make sure it's good.

Thanks!
Gary

To post a comment you must log in.
lp:~gary-lasker/software-center/lp586623 updated
813. By Gary Lasker

merge with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-05-28 02:07:53 +0000
3+++ debian/changelog 2010-05-28 02:25:39 +0000
4@@ -19,6 +19,8 @@
5 - add accelerator keys for navhistory actions
6 * merged lp:~osomon/software-center/memory_leak, fixes
7 memory leak regression (LP: #577540), thanks Olivier Tilloy!
8+ * softwarecenter/backend/aptd.py:
9+ - fix error when updating software sources (LP: #586623)
10
11 [ Michael Vogt ]
12 * merged lp:~glatzor/software-center/glatzor to get improved
13
14=== modified file 'softwarecenter/backend/aptd.py'
15--- softwarecenter/backend/aptd.py 2010-05-27 14:43:01 +0000
16+++ softwarecenter/backend/aptd.py 2010-05-28 02:25:39 +0000
17@@ -133,7 +133,7 @@
18 """ reload package list """
19 try:
20 trans = yield self.aptd_client.update_cache(defer=True)
21- yield self._run_transaction(trans, pkgname, appname, iconname)
22+ yield self._run_transaction(trans, None, None, None)
23 except Exception, error:
24 self._on_trans_error(error)
25

Subscribers

People subscribed via source and target branches