Software Updater

Merge lp:~brian-murray/update-manager/has-completed into lp:update-manager

  1. has-completed
  2. Merge into main
Proposed by Brian Murray on 2010-11-29
Status: Merged
Merged at revision: 1978
Proposed branch: lp:~brian-murray/update-manager/has-completed
Merge into: lp:update-manager
Diff against target: 29 lines (+3/-3)
1 file modified
DistUpgrade/DistUpgradeController.py (+3/-3)
To merge this branch: bzr merge lp:~brian-murray/update-manager/has-completed
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2010-11-29 Pending
Review via email: mp+42172@code.launchpad.net
To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks! Merged

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DistUpgrade/DistUpgradeController.py'
2--- DistUpgrade/DistUpgradeController.py 2010-11-18 00:58:03 +0000
3+++ DistUpgrade/DistUpgradeController.py 2010-11-29 21:16:15 +0000
4@@ -1597,7 +1597,7 @@
5 self.runPostInstallScripts()
6 # don't abort here, because it would restore the sources.list
7 self._view.information(_("Upgrade complete"),
8- _("The upgrade is completed but there "
9+ _("The upgrade has completed but there "
10 "were errors during the upgrade "
11 "process."))
12 sys.exit(1)
13@@ -1640,14 +1640,14 @@
14 self._view.updateStatus(_("Upgrading"))
15 if not self.doDistUpgrade():
16 self._view.information(_("Upgrade complete"),
17- _("The upgrade is completed but there "
18+ _("The upgrade has completed but there "
19 "were errors during the upgrade "
20 "process."))
21 return False
22 self._view.setStep(STEP_CLEANUP)
23 if not self.doPostUpgrade():
24 self._view.information(_("Upgrade complete"),
25- _("The upgrade is completed but there "
26+ _("The upgrade has completed but there "
27 "were errors during the upgrade "
28 "process."))
29 return False

Subscribers

People subscribed via source and target branches

to status/vote changes: