From 536601667968e0ec4cae96a79541844674d8dff4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Sep 2006 20:46:07 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - disable backports fetching --- DistUpgrade/DistUpgradeControler.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') 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(): -- cgit v1.2.3 From 9fb75fc0f0c1623542ea1c2a74edfe6d55b5db96 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Sep 2006 20:51:41 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - fix hasattr() usage --- DistUpgrade/Changelog | 1 + DistUpgrade/DistUpgradeControler.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 35df1255..c1de4192 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -2,6 +2,7 @@ - comment out the getRequiredBackport code because we will not use Breaks for the dapper->edgy upgrade yet (see #54234 for the rationale) + - bugfixes 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 2a887029..56ec7f08 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -551,9 +551,9 @@ class DistUpgradeControler(object): def abort(self): """ abort the upgrade, cleanup (as much as possible) """ - if hasattr(self, sources): + if hasattr(self, "sources"): self.sources.restoreBackup(self.sources_backup_ext) - if hasattr(self, aptcdrom): + if hasattr(self, "aptcdrom"): self.aptcdrom.restoreBackup(self.sources_backup_ext) # generate a new cache self._view.updateStatus(_("Restoring original system state")) -- cgit v1.2.3 From a7d1b0dd42e27785636db09b94a8fed834edebab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Sep 2006 23:34:28 +0200 Subject: * UpdateManager/Common/aptsources.py: - use self.source_code_sources when enabling a component * DistUpgrade/DistUpgradeControler.py: - make sure to enable restricted as well otherwise the kernel won't upgrade --- DistUpgrade/DistUpgradeControler.py | 5 +++++ UpdateManager/Common/aptsources.py | 2 +- debian/changelog | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 56ec7f08..ad4e5335 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -165,7 +165,12 @@ class DistUpgradeControler(object): # enable main (we always need this!) distro = Distribution() distro.get_sources(self.sources) + # we need both main + restricted for a real upgrade + # restricted is required for the kernel upgrade (otherwise + # it will just keep the kernel because linux-$arch depends on + # linux-restricted-modules from restricted) distro.enable_component(self.sources, "main") + distro.enable_component(self.sources, "restricted") # this must map, i.e. second in "from" must be the second in "to" # (but they can be different, so in theory we could exchange diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index 0d716231..06d83e01 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -636,7 +636,7 @@ class Distribution: # now do the same for source dists if self.get_source_code == True: comps_per_dist = {} - for s in sources: + for s in self.source_code_sources: if s.type != "deb-src": continue if not comps_per_dist.has_key(s.dist): diff --git a/debian/changelog b/debian/changelog index d817dea3..2f067c0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ update-manager (0.44.14) edgy; urgency=low * DistUprade/DistUpgradeControler.py: - check for self.sources, self.aptcdrom before using it (lp: #61852) - -- + -- Michael Vogt Tue, 26 Sep 2006 23:17:27 +0200 update-manager (0.44.13) edgy; urgency=low -- cgit v1.2.3 From a1ec5a007953cdd84e0ac6a0ee24e4252b724ca8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Sep 2006 23:49:15 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - no need to enable restricted by default, things will still work without it and it may well be a conscious decision --- DistUpgrade/DistUpgradeControler.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index ad4e5335..0b822022 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -165,12 +165,8 @@ class DistUpgradeControler(object): # enable main (we always need this!) distro = Distribution() distro.get_sources(self.sources) - # we need both main + restricted for a real upgrade - # restricted is required for the kernel upgrade (otherwise - # it will just keep the kernel because linux-$arch depends on - # linux-restricted-modules from restricted) + # make sure that main is enabled distro.enable_component(self.sources, "main") - distro.enable_component(self.sources, "restricted") # this must map, i.e. second in "from" must be the second in "to" # (but they can be different, so in theory we could exchange -- cgit v1.2.3 From 1ae6b2c078499dc2a9d99500cf4a2fce12ce78e5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Sep 2006 15:29:28 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - typo fix --- DistUpgrade/Changelog | 2 ++ DistUpgrade/DistUpgradeControler.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'DistUpgrade/DistUpgradeControler.py') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 1c1d4ab8..5f7ba584 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,5 @@ +2006-09-29: + - typo fix (thanks to Jane Silber) (lp: #62946) 2006-09-28: - bugfix in the cdromupgrade script 2006-09-27: diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 0b822022..7b255cf0 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -502,7 +502,7 @@ class DistUpgradeControler(object): "support for the following software " "packages. You can still get support " "from the community.\n\n" - "If you havn't enabled community " + "If you have not enabled community " "maintained software (universe), " "these packages will be suggested for " "removal in the next step."), -- cgit v1.2.3