* DistUpgrade/DistUpgradeControler.py:

  - disable backports fetching 

2 files changed, 13 insertions, 7 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index 54d194e6..35df1255 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,7 @@
+2006-09-26:
+	- comment out the getRequiredBackport code because we will
+	  not use Breaks for the dapper->edgy upgrade yet 
+          (see #54234 for the rationale)
 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 e32c0c5f..2a887029 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -622,14 +622,14 @@ class DistUpgradeControler(object):
         os.unlink(apt_pkg.Config.FindDir("Dir::Etc::sourceparts")+"/backport-source.list")
         apt_pkg.Config.Set("Dir::Cache::archives",cachedir)
         os.chdir(cwd)
-        return self.setupRequiredBackports(backportsdir)
-
-    def setupRequiredBackports(self, backportsdir):
-        " setup the required backports in a evil way "
         # unpack it
         for deb in glob.glob(backportsdir+"/*.deb"):
             ret = os.system("dpkg-deb -x %s %s" % (deb, backportsdir))
             # FIXME: do error checking
+        return self.setupRequiredBackports(backportsdir)
+
+    def setupRequiredBackports(self, backportsdir):
+        " setup the required backports in a evil way "
         # setup some pathes to make sure the new stuff is used
         os.environ["LD_LIBRARY_PATH"] = backportsdir+"/usr/lib"
         os.environ["PYTHONPATH"] = backportsdir+"/usr/lib/python2.4/site-packages/"
@@ -653,9 +653,11 @@ class DistUpgradeControler(object):
         if not self.prepare():
             self.abort(1)
 
-        if self.options and self.options.haveBackports == False:
-            # get backported packages (if needed)
-            self.getRequiredBackports()
+        # mvo: commented out for now, see #54234, this needs to be
+        #      refactored to use a arch=any tarball
+        #if self.options and self.options.haveBackports == False:
+        #    # get backported packages (if needed)
+        #    self.getRequiredBackports()
 
         # run a "apt-get update" now
         if not self.doUpdate():