diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-18 19:00:36 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-01-18 19:00:36 +0100 |
| commit | 734a19cffd43d5a523f083accffee865169f9bb0 (patch) | |
| tree | 26be26636205c2839ee0ca13b8dca9c1b28102cc /DistUpgrade | |
| parent | b3cf95cf422246b74df0b3176cabb9a11f824a98 (diff) | |
| download | python-apt-734a19cffd43d5a523f083accffee865169f9bb0.tar.gz | |
* make it the dapper upgrader
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/DistUpgradeCache.py | 2 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index dd552b73..c8e1e9a1 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -218,7 +218,7 @@ class MyCache(apt.Cache): """ get all packages that are installed from a foreign repo (and are actually downloadable) """ - foreign_pkgs =set() + foreign_pkgs=set() for pkg in self: if pkg.isInstalled and self.downloadable(pkg): # assume it is foreign and see if it is from the diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index f9859167..efb93bcc 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -227,7 +227,7 @@ class DistUpgradeControler(object): # this is the core - def breezyUpgrade(self): + def dapperUpgrade(self): # sanity check (check for ubuntu-desktop, brokenCache etc) self._view.updateStatus(_("Checking the system")) self._view.setStep(1) @@ -258,8 +258,8 @@ class DistUpgradeControler(object): if not self.askDistUpgrade(): self.abort() -# if not self.doDistUpgrade(): -# self.abort() + if not self.doDistUpgrade(): + self.abort() # do post-upgrade stuff self._view.setStep(4) @@ -270,6 +270,6 @@ class DistUpgradeControler(object): subprocess.call(["reboot"]) def run(self): - self.breezyUpgrade() + self.dapperUpgrade() |