From 12242daaf7269f69e438894ce9175f646ef4b5b5 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 29 Aug 2006 20:53:47 +0200
Subject: * DistUpgrade/DistUpgradeControler.py:   - fix the position of the
 cdrom.add()

---
 DistUpgrade/DistUpgradeControler.py | 11 ++++++-----
 1 file 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()
-- 
cgit v1.2.3