Merge lp:~barry/update-manager/bug-873468 into lp:update-manager

[Barry Warsaw]

Improves on the error text when a package is subsequently unavailable.

[lp:~barry/update-manager/bug-873468]

2380. By Barry Warsaw on 2012-04-17

trunk merge

2381. By Barry Warsaw on 2012-04-17

revert d/changelog

2382. By Barry Warsaw on 2012-04-17

slight rewording

=== modified file 'DistUpgrade/DistUpgradeController.py'
--- DistUpgrade/DistUpgradeController.py	2012-04-17 19:05:26 +0000
+++ DistUpgrade/DistUpgradeController.py	2012-04-17 20:03:20 +0000
@@ -1657,11 +1657,19 @@
                 #        missing sources entries but network errors etc)
                 logging.error("No '%s' available/downloadable after sources.list rewrite+update" % pkg)
                 self._view.error(_("Invalid package information"),
-                                 _("After your package information was "
-                                   "updated the essential package '%s' can "
-                                   "not be found anymore so "
-                                   "a bug reporting process is being "
-                                   "started.") % pkg)
+                                 _("After updating your package ",
+                                   "information, the essential package '%s' "
+                                   "could not be located. This may be "
+                                   "because you have no official mirrors "
+                                   "listed in your software sources, or "
+                                   "because of excessive load on the mirror "
+                                   "you are using. See /etc/apt/sources.list "
+                                   "for the current list of configured "
+                                   "software sources."
+                                   "\n"
+                                   "In the case of an overloaded mirror, you "
+                                   "may want to try the upgrade again later.")
+                                   % pkg)
                 subprocess.Popen(["apport-bug", "update-manager"])
                 self.abort()