diff options
| author | Sebastian Heinlein <sebastian.heinlein@web.de> | 2006-02-12 09:16:51 +0100 |
|---|---|---|
| committer | Sebastian Heinlein <sebastian.heinlein@web.de> | 2006-02-12 09:16:51 +0100 |
| commit | bd10456add8ee59da5a540ba53d70cf708cfcb54 (patch) | |
| tree | 2e907b60d7b40f9e59c1a5a2a931bfd36230fe86 /DistUpgrade | |
| parent | 59a431d92a0e07afbe7be8e01a0691311961aee8 (diff) | |
| parent | 3a54451998b246f94b3aa5150841e95f696d7d96 (diff) | |
| download | python-apt-bd10456add8ee59da5a540ba53d70cf708cfcb54.tar.gz | |
* merged from mvo
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgrade.glade | 2 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeCache.py | 12 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 697514cf..6bb0867e 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -1167,7 +1167,7 @@ <child> <widget class="GtkLabel" id="label27"> <property name="visible">True</property> - <property name="label" translatable="yes">The upgrade of your system requires + <property name="label">The upgrade of your system requires ... to download 2000 MByte diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index b20c9f77..ab7e24a4 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -120,7 +120,8 @@ class MyCache(apt.Cache): for pkg in self.config.getlist("Distro","PostUpgrade%s" % rule): action(pkg, "Distro PostUpgrade%s rule" % rule) for key in self.metapkgs: - if self.has_key(key) and self[key].isInstalled: + if self.has_key(key) and (self[key].isInstalled or + self[key].markedInstall): for pkg in self.config.getlist(key,"PostUpgrade%s" % rule): action(pkg, "%s PostUpgrade%s rule" % (key, rule)) @@ -128,10 +129,15 @@ class MyCache(apt.Cache): try: # upgrade (and make sure this way that the cache is ok) self.upgrade(True) - self.postUpgradeRule() - + + # then see if meta-pkgs are missing if not self._installMetaPkgs(view): raise SystemError, _("Can't upgrade required meta-packages") + + # and if we have some special rules + self.postUpgradeRule() + + # see if it all makes sense if not self._verifyChanges(): raise SystemError, _("A essential package would have to be removed") except SystemError, e: diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index b4ad4a0a..bf4acf0c 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -170,7 +170,7 @@ class GtkInstallProgressAdapter(InstallProgress): self.label_status.set_text(self.status) while gtk.events_pending(): gtk.main_iteration() - time.sleep(0.01) + time.sleep(0.001) class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): |