summaryrefslogtreecommitdiff
path: root/DistUpgrade/DistUpgradeControler.py
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-08-29 20:53:47 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-08-29 20:53:47 +0200
commit12242daaf7269f69e438894ce9175f646ef4b5b5 (patch)
tree383acd3692dec0dff8c1081806ec9105adc2d169 /DistUpgrade/DistUpgradeControler.py
parentf0dd9afe6d2ad9f3efa0d5c1abfedca75d125f1a (diff)
downloadpython-apt-12242daaf7269f69e438894ce9175f646ef4b5b5.tar.gz
* DistUpgrade/DistUpgradeControler.py:
- fix the position of the cdrom.add()
Diffstat (limited to 'DistUpgrade/DistUpgradeControler.py')
-rw-r--r--DistUpgrade/DistUpgradeControler.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index a6a78473..dd4074ac 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -550,11 +550,6 @@ class DistUpgradeControler(object):
if not self.prepare():
self.abort(1)
- # add cdrom (if we have one)
- if (self.aptcdrom and
- not self.aptcdrom.add(self.sources_backup_ext)):
- sys.exit(1)
-
# run a "apt-get update" now
if not self.doUpdate():
sys.exit(1)
@@ -567,6 +562,12 @@ class DistUpgradeControler(object):
self._view.updateStatus(_("Updating repository information"))
if not self.updateSourcesList():
self.abort()
+
+ # add cdrom (if we have one)
+ if (self.aptcdrom and
+ not self.aptcdrom.add(self.sources_backup_ext)):
+ sys.exit(1)
+
# then update the package index files
if not self.doUpdate():
self.abort()