diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-26 20:51:41 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-26 20:51:41 +0200 |
| commit | 9fb75fc0f0c1623542ea1c2a74edfe6d55b5db96 (patch) | |
| tree | e9420a5f40da02f315732190c4298166258bf213 | |
| parent | 536601667968e0ec4cae96a79541844674d8dff4 (diff) | |
| download | python-apt-9fb75fc0f0c1623542ea1c2a74edfe6d55b5db96.tar.gz | |
* DistUpgrade/DistUpgradeControler.py:
- fix hasattr() usage
| -rw-r--r-- | DistUpgrade/Changelog | 1 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 35df1255..c1de4192 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -2,6 +2,7 @@ - comment out the getRequiredBackport code because we will not use Breaks for the dapper->edgy upgrade yet (see #54234 for the rationale) + - bugfixes 2006-09-23: - support fetching backports of selected packages first and use them for the upgrade (needed to support Breaks) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 2a887029..56ec7f08 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -551,9 +551,9 @@ class DistUpgradeControler(object): def abort(self): """ abort the upgrade, cleanup (as much as possible) """ - if hasattr(self, sources): + if hasattr(self, "sources"): self.sources.restoreBackup(self.sources_backup_ext) - if hasattr(self, aptcdrom): + if hasattr(self, "aptcdrom"): self.aptcdrom.restoreBackup(self.sources_backup_ext) # generate a new cache self._view.updateStatus(_("Restoring original system state")) |