diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-04-27 17:57:13 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-04-27 17:57:13 +0200 |
| commit | caca5e2d382ef3a0e5d00dc888f0448620372ee0 (patch) | |
| tree | f15c005c707ca6423e03fc00ab51a492eef28cd7 /DistUpgrade | |
| parent | 99bd3a8f471864c4ab945c1932f48088c79ed71d (diff) | |
| download | python-apt-caca5e2d382ef3a0e5d00dc888f0448620372ee0.tar.gz | |
* check for BaseMetaPkgs after the cache was reopend (to see if the update still has the essential packages)
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 10 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 15a29c05..65713e68 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -336,6 +336,10 @@ class DistUpgradeControler(object): # then update the package index files if not self.doUpdate(): self.abort() + + # then open the cache (again) + self._view.updateStatus(_("Checking package manager")) + self.openCache() # now check if we still have some key packages after the update # if not something went seriously wrong for pkg in self.config.getlist("Distro","BaseMetaPkgs"): @@ -346,13 +350,9 @@ class DistUpgradeControler(object): "updated the essential package '%s' can " "not be found anymore.\n" "This indicates a serious error, please " - "report this as a bug.")) + "report this as a bug.") % pkg) self.abort() - # then open the cache (again) - self._view.updateStatus(_("Checking package manager")) - self.openCache() - # calc the dist-upgrade and see if the removals are ok/expected # do the dist-upgrade self._view.setStep(3) diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index bf1fcbe8..561ab22c 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -309,8 +309,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): logging.error("not handled expection:\n%s" % "\n".join(lines)) self.error(_("A fatal error occured"), _("Please report this as a bug and include the " - "files ~/dist-upgrade.log and ~/dist-upgrade-apt.log " - "in your report. The upgrade aborts now. "), + "files /var/log/dist-upgrade.log and " + "/var/log/dist-upgrade-apt.log " + "in your report. The upgrade aborts now.\n" + "Your original sources.list was saved in " + "/etc/apt/sources.list.distUpgrade."), "\n".join(lines)) sys.exit(1) |