diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-25 12:45:53 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-25 12:45:53 +0200 |
| commit | d8c288d928da41fae20947b7dd2064740c2593b3 (patch) | |
| tree | e00d94e7c77b45f8ac9792a9c80a68e2a2391d7c | |
| parent | 3790683bfbc3f5f4135d4c05989396c07152b8b7 (diff) | |
| download | python-apt-d8c288d928da41fae20947b7dd2064740c2593b3.tar.gz | |
* DistUpgrade/DistUpgradeControler.py:
- check for self.sources,self.aptcdrom before using it
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 6 | ||||
| -rw-r--r-- | debian/changelog | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index f9c4c0dd..e32c0c5f 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -551,8 +551,10 @@ class DistUpgradeControler(object): def abort(self): """ abort the upgrade, cleanup (as much as possible) """ - self.sources.restoreBackup(self.sources_backup_ext) - self.aptcdrom.restoreBackup(self.sources_backup_ext) + if hasattr(self, sources): + self.sources.restoreBackup(self.sources_backup_ext) + if hasattr(self, aptcdrom): + self.aptcdrom.restoreBackup(self.sources_backup_ext) # generate a new cache self._view.updateStatus(_("Restoring original system state")) self._view.abort() diff --git a/debian/changelog b/debian/changelog index 6631a01b..d817dea3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +update-manager (0.44.14) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - put the cancel button inside the text-area to avoid flickering + * DistUprade/DistUpgradeControler.py: + - check for self.sources, self.aptcdrom before using it (lp: #61852) + + -- + update-manager (0.44.13) edgy; urgency=low * UpdateManager/UpdateManager.py: |