summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-08-29 15:41:01 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-08-29 15:41:01 +0200
commitfa7c32ce8c1419e29397d8b5e642b17f7a9b28f2 (patch)
treec1965bf53f3bb2f2b1448ac7de5239d131dec070
parent896c0ad16ce3f372fbe7177751d9c0e93ea0feb3 (diff)
downloadpython-apt-fa7c32ce8c1419e29397d8b5e642b17f7a9b28f2.tar.gz
* DistUpgrade/DistUpgradeControler.py:
- more bugfixing
-rw-r--r--DistUpgrade/DistUpgradeControler.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index ef4283a5..5e5902c6 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -127,7 +127,7 @@ class DistUpgradeControler(object):
)
self.useNetwork = res
logging.debug("useNetwork: '%s' (selected by user)" % res)
- return True
+ return True
def rewriteSourcesList(self, mirror_check=True):
logging.debug("rewriteSourcesList()")
@@ -225,7 +225,7 @@ class DistUpgradeControler(object):
) % (self.fromDist, self.toDist))
if res:
# re-init the sources and try again
- self.sources = SourcesList()
+ self.sources = SourcesList(matcherPath=".")
if not self.rewriteSourcesList(mirror_check=False):
#hm, still nothing useful ...
prim = _("Generate default sources?")
@@ -521,7 +521,7 @@ class DistUpgradeControler(object):
self._view.setStep(1)
if not self.prepare():
- abort(1)
+ self.abort(1)
# add cdrom (if we have one)
if self.aptcdrom: