From bb6ff35e3a7f05513a3a742727577baf46f9d908 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 31 Jul 2006 18:22:09 +0200 Subject: * edgy dist-upgrader created --- DistUpgrade/DistUpgradeControler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index b6b52c72..9ad95d3f 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -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() -- cgit v1.2.3 From cc6eb736ca4613d70c3f7ff30317af340ca70bb7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 1 Aug 2006 00:04:31 +0200 Subject: * UpdateManager/Common/aptsources.py: - added NullMatcher and a "withMatcher" argument --- DistUpgrade/DistUpgradeControler.py | 2 +- UpdateManager/Common/aptsources.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9ad95d3f..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"), diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index fce06c2b..3d317b15 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -204,11 +204,17 @@ class SourceEntry: return line # the SourceList file as a class +class NullMatcher(object): + def match(self, s): + return True + class SourcesList: def __init__(self, withMatcher=True): self.list = [] # of Type SourceEntries if withMatcher: self.matcher = SourceEntryMatcher() + else: + self.matcher = NullMatcher() self.refresh() def refresh(self): -- cgit v1.2.3