summaryrefslogtreecommitdiff
path: root/DistUpgrade/DistUpgradeControler.py
diff options
context:
space:
mode:
authorglatzor@ubuntu.com <>2006-08-02 18:37:59 +0200
committerglatzor@ubuntu.com <>2006-08-02 18:37:59 +0200
commit0a5aacc19bfe31eda221e2f6476712097d693a06 (patch)
tree8995ea136686477cc31a4e240b6464ea0c6d6ed0 /DistUpgrade/DistUpgradeControler.py
parent70bf03a91044f338aed8acd819c15dc8d5968103 (diff)
parentdde2af913b3f26958f93f604d7a75e61e64ec7f1 (diff)
downloadpython-apt-0a5aacc19bfe31eda221e2f6476712097d693a06.tar.gz
* merge with main
Diffstat (limited to 'DistUpgrade/DistUpgradeControler.py')
-rw-r--r--DistUpgrade/DistUpgradeControler.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index b6b52c72..9842484d 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -143,7 +143,7 @@ class DistUpgradeControler(object):
def updateSourcesList(self):
logging.debug("updateSourcesList()")
- self.sources = SourcesList()
+ self.sources = SourcesList(withMatcher=False)
if not self.rewriteSourcesList(mirror_check=True):
logging.error("No valid mirror found")
res = self._view.askYesNoQuestion(_("No valid mirror found"),
@@ -446,7 +446,7 @@ class DistUpgradeControler(object):
# this is the core
- def dapperUpgrade(self):
+ def edgyUpgrade(self):
# sanity check (check for ubuntu-desktop, brokenCache etc)
self._view.updateStatus(_("Checking package manager"))
self._view.setStep(1)
@@ -516,6 +516,6 @@ class DistUpgradeControler(object):
subprocess.call(["reboot"])
def run(self):
- self.dapperUpgrade()
+ self.edgyUpgrade()