diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-10-26 12:31:52 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-10-26 12:31:52 +0200 |
| commit | dcee921a1107db6e5c8042598641b422a77e24c2 (patch) | |
| tree | c733204d23625109cd282afcf2ac54539d300fd9 /DistUpgrade | |
| parent | aaa740bde79a3e376f5c46215acf53df9d67dc3e (diff) | |
| download | python-apt-dcee921a1107db6e5c8042598641b422a77e24c2.tar.gz | |
* DistUpgrade/DistUpgradeCache.py:
- ensure that xserver-xorg-video-all is upgraded (if xserver-xorg-driver-all is installed)
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/Changelog | 3 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeCache.py | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index bea2b932..b42e2d76 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,6 @@ +2006-10-26: + - make sure that xserver-xorg-video-all get installed if + xserver-xorg-driver-all was installed before (lp: #58424) 2006-10-21: - comment out old cdrom sources - demotions updated diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 9c062c41..d9dc9959 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -212,6 +212,17 @@ class MyCache(apt.Cache): logging.info("Forcing downgrade of libgl1-mesa-dri for xgl.compz.info installs") self._depcache.SetCandidateVer(pkg._pkg, ver) break + + # deal with general if $foo is installed, install $bar + for (fr, to) in [("xserver-xorg-driver-all","xserver-xorg-video-all")]: + if self.has_key(fr) and self.has_key(to): + if self[fr].isInstalled and not self[to].markedInstall: + try: + self.markInstall(to,"%s->%s quirk upgrade rule" % (fr, to)) + except SystemError, e: + logging.debug("Failed to apply %s->%s install (%s)" % (fr, to, e)) + + def dapperQuirks(self): """ this function works around quirks in the breezy->dapper upgrade """ |