diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-10-23 16:51:05 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-10-23 16:51:05 +0200 |
| commit | 7c53126f73135715ac90bc5d6e2759d52de433fd (patch) | |
| tree | 10060da55d435bbe50576fb5676c9acbcd326020 /DistUpgrade | |
| parent | 703e7ca6c3a7d99db6bfcdbb7e09b5120327f850 (diff) | |
| download | python-apt-7c53126f73135715ac90bc5d6e2759d52de433fd.tar.gz | |
* DistUpgrade/DistUpgradeControler.py:
- comment out old cdrom sources (causes trouble with the
sysvinit<->upstart upgrade because sysinit is still essential)
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/Changelog | 3 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index a13db18f..c374ddd0 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,9 +1,12 @@ 2006-10-21: + - comment out old cdrom sources +2006-10-21: - fix incorrect arguments in fixup logging (lp: #67311) - more error logging - fix upgrade problems for people with unofficial compiz repositories (lp: #58424) - rosetta i18n updates + - uploaded 2006-10-17: - ensure bzr, tomboy and xserver-xorg-input-* are properly upgraded diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index a968cdb8..0136ce68 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -202,7 +202,7 @@ class DistUpgradeControler(object): # we disable breezy cdrom sources to make sure that demoted # packages are removed - if entry.uri.startswith("cdrom:") and entry.dist == "breezy": + if entry.uri.startswith("cdrom:") and entry.dist == self.toDist: entry.disabled = True continue # ignore cdrom sources otherwise |