From d37a18474fd00a9cb3e57f13517628095c15bba7 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 16:04:40 +0200 Subject: * improve wording of some dialogs: no-longer-supported, no-upgrades-avaiable and replace-conf-file * introduce an abort method for the view to provide a visual feedback that the upgrade was canceled --- DistUpgrade/DistUpgradeView.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'DistUpgrade/DistUpgradeView.py') diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 9fda83d4..d5b430b8 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -72,6 +72,9 @@ class DistUpgradeView(object): on the current view """ pass + def abort(): + """ provide a visual feedback that the upgrade was aborted """ + pass def setStep(self, step): """ we have 5 steps current for a upgrade: 1. Analyzing the system -- cgit v1.2.3 From 77bd6849a9bcd0855b47244558f1df7bc64da197 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Sep 2006 14:56:29 +0200 Subject: * DistUpgrade/DistUpgradeView.py: - import subprocess --- DistUpgrade/DistUpgradeView.py | 1 + 1 file changed, 1 insertion(+) (limited to 'DistUpgrade/DistUpgradeView.py') diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index d5b430b8..a9cd16d7 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -43,6 +43,7 @@ def estimatedDownloadTime(requiredDownload): class DumbTerminal(object): def call(self, cmd): " expects a command in the subprocess style (as a list) " + import subprocess subprocess.call(cmd) -- cgit v1.2.3 From 408753014a2ffe1c52a0941e9db10b912e69a6ab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 4 Oct 2006 21:26:42 +0200 Subject: * DistUpgrade/DistUpgradeView.py: - show the dsl download time first and then the modem time --- DistUpgrade/DistUpgradeView.py | 4 ++-- debian/changelog | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'DistUpgrade/DistUpgradeView.py') diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index a9cd16d7..40617774 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -35,8 +35,8 @@ def estimatedDownloadTime(requiredDownload): """ get the estimated download time """ timeModem = requiredDownload/(56*1024/8) # 56 kbit timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit - s= _("This download will take about %s with a 56k modem and about %s with " - "a 1Mbit DSL connection" % (FuzzyTimeToStr(timeModem), FuzzyTimeToStr(timeDSL))) + s= _("This download will take about %s with a 1Mbit DSL connection " + "and about %s with a 56k modem" % (FuzzyTimeToStr(timeDSL),FuzzyTimeToStr(timeModem))) return s diff --git a/debian/changelog b/debian/changelog index 6bedba40..afc3c0a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ update-manager (0.44.15) edgy; urgency=low * fix plural forms for ro, pl (lp: #46421) * properly escape comments before displaying them (lp: #63475) - -- + -- Michael Vogt Wed, 4 Oct 2006 21:10:40 +0200 update-manager (0.44.14) edgy; urgency=low -- cgit v1.2.3 From ae8796907bc0d690057bc661ca926dd6bc4554cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 23 Oct 2006 13:59:18 +0200 Subject: * force downgrade of libgl1-mesa-dri package if unofficial compiz packages are installed (lp: #58424) --- DistUpgrade/Changelog | 3 +++ DistUpgrade/DistUpgradeCache.py | 27 ++++++++++++++++++++++++++- DistUpgrade/DistUpgradeView.py | 6 ++++-- 3 files changed, 33 insertions(+), 3 deletions(-) (limited to 'DistUpgrade/DistUpgradeView.py') diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 6cb6a7df..15988e46 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,5 +1,8 @@ 2006-10-21: - fix incorrect arguments in fixup logging (lp: #67311) + - more error logging + - fix upgrade problems for people with unofficial compiz + repositories (lp: #58424) 2006-10-17: - ensure bzr, tomboy and xserver-xorg-input-* are properly upgraded diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 7df0b510..9c062c41 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -195,7 +195,23 @@ class MyCache(apt.Cache): self.markInstall(pkgname,"%s quirk upgrade rule" % pkgname) except SystemError, e: logging.debug("Failed to apply %s install (%s)" % (pkgname,e)) - + # libgl1-mesa-dri from xgl.compiz.info (and friends) breaks the + # upgrade, work around this here by downgrading the package + if self.has_key("libgl1-mesa-dri"): + pkg = self["libgl1-mesa-dri"] + # the version from the compiz repo has a "6.5.1+cvs20060824" ver + if (pkg.candidateVersion == pkg.installedVersion and + "+cvs2006" in pkg.candidateVersion): + for ver in pkg._pkg.VersionList: + # the "officual" edgy version has "6.5.1~20060817-0ubuntu3" + if "~2006" in ver.VerStr: + # ensure that it is from a trusted repo + for (VerFileIter, index) in ver.FileList: + indexfile = self._list.FindIndex(VerFileIter) + if indexfile and indexfile.IsTrusted: + logging.info("Forcing downgrade of libgl1-mesa-dri for xgl.compz.info installs") + self._depcache.SetCandidateVer(pkg._pkg, ver) + break def dapperQuirks(self): """ this function works around quirks in the breezy->dapper upgrade """ @@ -240,6 +256,15 @@ class MyCache(apt.Cache): for pkg in self.getChanges(): if pkg.markedDelete: continue + # special case because of a bug in pkg.candidateOrigin + if pkg.markedDowngrade: + for ver in pkg._pkg.VersionList: + # version is lower than installed one + if apt_pkg.VersionCompare(ver.VerStr, pkg.installedVersion) < 0: + for (verFileIter,index) in ver.FileList: + if not origin.trusted: + untrusted.append(pkg.name) + continue origins = pkg.candidateOrigin trusted = False for origin in origins: diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 40617774..109a278b 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -95,12 +95,14 @@ class DistUpgradeView(object): self.toInstall = [] self.toUpgrade = [] self.toRemove = [] + self.toDowngrade = [] for pkg in changes: if pkg.markedInstall: self.toInstall.append(pkg.name) elif pkg.markedUpgrade: self.toUpgrade.append(pkg.name) elif pkg.markedDelete: self.toRemove.append(pkg.name) - # no downgrades, re-installs - assert(len(self.toInstall)+len(self.toUpgrade)+len(self.toRemove) == len(changes)) + elif pkg.markedDowngrade: self.toDowngrade.append(pkg.name) + # no re-installs + assert(len(self.toInstall)+len(self.toUpgrade)+len(self.toRemove)+len(self.toDowngrade) == len(changes)) def askYesNoQuestion(self, summary, msg): " ask a Yes/No question and return True on 'Yes' " pass -- cgit v1.2.3