Software Updater

Merge lp:~kelemeng/update-manager/bug640972 into lp:ubuntu/maverick/update-manager

  1. bug640972
  2. Merge into maverick
Proposed by Gabor Kelemen
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~kelemeng/update-manager/bug640972
Merge into: lp:ubuntu/maverick/update-manager
Diff against target: 54 lines (+5/-5)
4 files modified
DistUpgrade/DistUpgradeCache.py (+1/-1)
UpdateManager/Core/DistUpgradeFetcherCore.py (+1/-1)
UpdateManager/DistUpgradeFetcherKDE.py (+2/-2)
UpdateManager/UpdateManager.py (+1/-1)
To merge this branch: bzr merge lp:~kelemeng/update-manager/bug640972
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+35815@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DistUpgrade/DistUpgradeCache.py'
2--- DistUpgrade/DistUpgradeCache.py 2010-06-09 14:32:05 +0000
3+++ DistUpgrade/DistUpgradeCache.py 2010-09-17 12:26:15 +0000
4@@ -847,7 +847,7 @@
5 self[key].mark_install()
6 except (SystemError, KeyError), e:
7 logging.error("failed to mark '%s' for install (%s)" % (key,e))
8- view.error(_("Can't install '%s'" % key),
9+ view.error(_("Can't install '%s'") % key,
10 _("It was impossible to install a "
11 "required package. Please report "
12 "this as a bug. "))
13
14=== modified file 'UpdateManager/Core/DistUpgradeFetcherCore.py'
15--- UpdateManager/Core/DistUpgradeFetcherCore.py 2010-07-09 10:07:34 +0000
16+++ UpdateManager/Core/DistUpgradeFetcherCore.py 2010-09-17 12:26:15 +0000
17@@ -273,7 +273,7 @@
18 return False
19 else:
20 self.error(_("Can not run the upgrade"),
21- _("The error message is '%s'." % e.strerror))
22+ _("The error message is '%s'.") % e.strerror)
23 return True
24
25 if __name__ == "__main__":
26
27=== modified file 'UpdateManager/DistUpgradeFetcherKDE.py'
28--- UpdateManager/DistUpgradeFetcherKDE.py 2009-01-26 17:26:40 +0000
29+++ UpdateManager/DistUpgradeFetcherKDE.py 2010-09-17 12:26:15 +0000
30@@ -138,9 +138,9 @@
31 if currentItem > self.totalItems:
32 currentItem = self.totalItems
33 if self.currentCPS > 0:
34- self.label.setText(_("Downloading additional package files...") + _("File %s of %s at %sB/s" % (self.currentItems,self.totalItems,apt_pkg.SizeToStr(self.currentCPS))))
35+ self.label.setText(_("Downloading additional package files...") + _("File %s of %s at %sB/s") % (self.currentItems,self.totalItems,apt_pkg.SizeToStr(self.currentCPS)))
36 else:
37- self.label.setText(_("Downloading additional package files...") + _("File %s of %s" % (self.currentItems,self.totalItems)))
38+ self.label.setText(_("Downloading additional package files...") + _("File %s of %s") % (self.currentItems,self.totalItems))
39 KApplication.kApplication().processEvents()
40 return True
41
42
43=== modified file 'UpdateManager/UpdateManager.py'
44--- UpdateManager/UpdateManager.py 2010-08-27 10:54:42 +0000
45+++ UpdateManager/UpdateManager.py 2010-09-17 12:26:15 +0000
46@@ -612,7 +612,7 @@
47 except SystemError:
48 pass
49 cmd = ["/usr/bin/gksu",
50- "--desktop", "/usr/share/applications/software-properties.desktop",
51+ "--desktop", "/usr/share/applications/software-properties-gtk.desktop",
52 "--", "/usr/bin/software-properties-gtk","--open-tab","2",
53 "--toplevel", "%s" % self.window_main.window.xid ]
54 self.window_main.set_sensitive(False)

Subscribers

People subscribed via source and target branches

to all changes: