diff -ru 20061016.2032/Changelog 20061023.1721/Changelog --- 20061016.2032/Changelog 2006-10-16 19:25:17.000000000 +0100 +++ 20061023.1721/Changelog 2006-10-23 16:15:22.000000000 +0100 @@ -1,3 +1,17 @@ +2006-10-21: + - comment out old cdrom sources + - demotions updated +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) + - rosetta i18n updates + - uploaded +2006-10-17: + - ensure bzr, tomboy and xserver-xorg-input-* are properly + upgraded + - don't fail if dpkg sents unexpected status lines (lp: #66013) 2006-10-16: - remove leftover references to ubuntu-base and use ubuntu-minimal and ubuntu-standard instead diff -ru 20061016.2032/DistUpgradeCache.py 20061023.1721/DistUpgradeCache.py --- 20061016.2032/DistUpgradeCache.py 2006-10-12 10:17:37.000000000 +0100 +++ 20061023.1721/DistUpgradeCache.py 2006-10-21 22:15:09.000000000 +0100 @@ -166,8 +166,8 @@ def edgyQuirks(self): """ this function works around quirks in the dapper->edgy upgrade """ logging.debug("running edgyQuirks handler") - # deal with the python2.4-$foo -> python-$foo transition for pkg in self: + # deal with the python2.4-$foo -> python-$foo transition if (pkg.name.startswith("python2.4-") and pkg.isInstalled and not pkg.markedUpgrade): @@ -178,15 +178,40 @@ "python2.4->python upgrade rule") except SystemError, e: logging.debug("Failed to apply python2.4->python install: %s (%s)" % (basepkg, e)) - # deal with *gar*gar* hpijs - if (self.has_key("hpijs") and self["hpijs"].isInstalled and - not self["hpijs"].markedUpgrade): - try: - self.markInstall("hpijs","hpijs quirk upgrade rule") - except SystemError, e: - logging.debug("Failed to apply hpijs install (%s)" % e) + # xserver-xorg-input-$foo gives us trouble during the upgrade too + if (pkg.name.startswith("xserver-xorg-input-") and + pkg.isInstalled and + not pkg.markedUpgrade): + try: + self.markInstall(pkg.name, "xserver-xorg-input fixup rule") + except SystemError, e: + logging.debug("Failed to apply fixup: %s (%s)" % (pkg.name, e)) - + # deal with held-backs that are unneeded + for pkgname in ["hpijs", "bzr", "tomboy"]: + if (self.has_key(pkgname) and self[pkgname].isInstalled and + not self[pkgname].markedUpgrade): + try: + 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 """ @@ -231,6 +256,15 @@ 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 -ru 20061016.2032/DistUpgradeControler.py 20061023.1721/DistUpgradeControler.py --- 20061016.2032/DistUpgradeControler.py 2006-10-13 18:12:04.000000000 +0100 +++ 20061023.1721/DistUpgradeControler.py 2006-10-23 15:57:24.000000000 +0100 @@ -202,7 +202,7 @@ # we disable breezy cdrom sources to make sure that demoted # packages are removed - if entry.uri.startswith("cdrom:") and entry.dist == "breezy": + if entry.uri.startswith("cdrom:") and entry.dist == self.fromDist: entry.disabled = True continue # ignore cdrom sources otherwise @@ -359,7 +359,8 @@ continue # no exception, so all was fine, we are done return True - + + logging.error("doUpdate() failed complettely") self._view.error(_("Error during update"), _("A problem occured during the update. " "This is usually some sort of network " @@ -397,6 +398,7 @@ logging.debug("free on %s: %s " % (archivedir, free)) if self.cache.requiredDownload > free: free_at_least = apt_pkg.SizeToStr(self.cache.requiredDownload-free) + logging.error("not enough free space (missing %s)" % free_at_least) self._view.error(err_sum, err_long % (free_at_least,archivedir)) return False @@ -461,6 +463,7 @@ res = self.cache.commit(fprogress,iprogress) except SystemError, e: # installing the packages failed, can't be retried + logging.error("SystemError from cache.commit(): %s" % e) self._view.getTerminal().call(["dpkg","--configure","-a"]) self._view.error(_("Could not install the upgrades"), _("The upgrade aborts now. Your system " @@ -480,7 +483,7 @@ return True # maximum fetch-retries reached without a successful commit - logging.debug("giving up on fetching after maximum retries") + logging.error("giving up on fetching after maximum retries") self._view.error(_("Could not download the upgrades"), _("The upgrade aborts now. Please check your "\ "internet connection or "\ @@ -565,6 +568,7 @@ try: res = self.cache.commit(fprogress,iprogress) except (SystemError, IOError), e: + logging.error("cache.commit() in doPostUpgrade() failed: %s" % e) self._view.error(_("Error during commit"), _("Some problem occured during the clean-up. " "Please see the below message for more " @@ -673,6 +677,7 @@ self._view.setStep(1) if not self.prepare(): + logging.error("self.prepared() failed") self._view.error(_("Preparing the upgrade failed"), _("Preparing the system for the upgrade " "failed. Please report this as a bug " diff -ru 20061016.2032/DistUpgradeView.py 20061023.1721/DistUpgradeView.py --- 20061016.2032/DistUpgradeView.py 2006-10-05 17:43:49.000000000 +0100 +++ 20061023.1721/DistUpgradeView.py 2006-10-21 21:03:40.000000000 +0100 @@ -95,12 +95,14 @@ 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 diff -ru 20061016.2032/DistUpgradeViewGtk.py 20061023.1721/DistUpgradeViewGtk.py --- 20061016.2032/DistUpgradeViewGtk.py 2006-10-11 20:14:32.000000000 +0100 +++ 20061023.1721/DistUpgradeViewGtk.py 2006-10-23 12:48:09.000000000 +0100 @@ -267,7 +267,10 @@ self.label_status.set_text("") def updateInterface(self): - InstallProgress.updateInterface(self) + try: + InstallProgress.updateInterface(self) + except ValueError, e: + logging.error("got ValueError from InstallPrgoress.updateInterface. Line was '%s' (%s)" % (self.read, e)) # check if we haven't started yet with packages, pulse then if self.start_time == 0.0: self.progress.pulse() diff -ru 20061016.2032/demoted.cfg 20061023.1721/demoted.cfg --- 20061016.2032/demoted.cfg 2006-09-26 20:20:20.000000000 +0100 +++ 20061023.1721/demoted.cfg 2006-10-23 16:19:25.000000000 +0100 @@ -1,6 +1,9 @@ # demoted packages blender +bluez-hcidump bluez-pcmcia-support +console-common +console-data courier-authdaemon courier-base courier-doc @@ -9,15 +12,62 @@ courier-pop courier-pop-ssl courier-ssl +cupsys-driver-gimpprint +dh-consoledata +doc-debian +expat +foomatic-db-gimp-print +foomatic-db-gutenprint ftgl-dev +g++-3.4 +g++-4.0 +gok +gok-doc +gtk2-engines-clearlooks +gtk2-engines-crux +gtk2-engines-highcontrast +gtk2-engines-industrial +gtk2-engines-lighthouseblue +gtk2-engines-mist +gtk2-engines-pixbuf +gtk2-engines-redmond95 +gtk2-engines-smooth +gtk2-engines-thinice +heimdal-dev +ia32-libs-gtk +ia32-libs-kde +ia32-libs-openoffice.org +idle-python2.4 +ijsgimpprint +ijsgutenprint +installation-guide-hppa +irssi-text +kde-style-lipstik +klaptopdaemon +kmplayer-doc lam4-dev lam4c2 +libaltlinuxhyph-dev +libasn1-6-heimdal +libcompfaceg1 +libcompfaceg1-dev +libdvdnav-dev +libdvdnav4 +libdvdread3 libgd-gd2-noxpm-perl -libgmime2.1 -libgmime2.1-cil +libgnujaxp-java +libgnujaxp-java-doc +libgnujaxp-jni libgnutls12 +libgssapi4-heimdal +libhdb7-heimdal +libkadm5clnt4-heimdal +libkadm5srv7-heimdal +libkafs0-heimdal +libkrb5-17-heimdal libmpich1.0-dev libmpich1.0c2 +libmythes0 libnetcdf++3 libnetcdf3 libpgtcl-dev @@ -25,18 +75,71 @@ libreiserfs0.3-0 libreiserfs0.3-dbg libreiserfs0.3-dev +libroken16-heimdal +libstdc++6-4.0-dbg +libstdc++6-4.0-dev +libstdc++6-4.0-doc +libstdc++6-dbg +libstdc++6-dev +libsyck0-dev +libtasn1-2 +libtasn1-2-dev +libtest-builder-tester-perl libunicode-string-perl libxaw6 libxaw6-dbg +libxine-main1 +memtester +menu-xdg +mgetty +mgetty-fax +mklibs-copy mono-classlib-2.0 +mozilla-firefox +mozilla-firefox-locale-eu +mozilla-firefox-locale-lt +mozilla-firefox-locale-mn +mozilla-firefox-locale-nb-no +mozilla-thunderbird-locale-ca +mozilla-thunderbird-locale-de +mozilla-thunderbird-locale-fr +mozilla-thunderbird-locale-it +mozilla-thunderbird-locale-nl +mozilla-thunderbird-locale-pl +mozilla-thunderbird-locale-uk mpi-doc mpich-bin +nagios-common +nagios-mysql +nagios-pgsql +nagios-plugins +nagios-plugins-basic +nagios-plugins-standard +nagios-text netcdfg-dev +nvidia-glx-legacy +nvidia-glx-legacy-dev +pcmcia-cs +procinfo +publib-dev +python-gadfly +python-htmltmpl +python-kjbuckets python-netcdf +python-numeric-ext python-parted python-pgsql python-scientific-doc +python-soappy +python-stats +python-syck +readahead-list sdf-doc +springgraph +sysutils tcl8.0 tcl8.0-dev +tcsh tk8.0 +x-window-system-core +xfmedia Binary files 20061016.2032/edgy.tar.gz and 20061023.1721/edgy.tar.gz differ Only in 20061016.2032: edgy.tar.gz.gpg Binary files 20061016.2032/mo/am/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/am/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ar/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ar/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/be/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/be/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/bg/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/bg/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/bn/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/bn/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/br/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/br/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ca/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ca/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/cs/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/cs/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/csb/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/csb/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/da/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/da/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/de/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/de/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/el/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/el/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/en_AU/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/en_AU/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/en_CA/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/en_CA/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/en_GB/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/en_GB/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/eo/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/eo/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/es/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/es/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/et/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/et/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/eu/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/eu/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/fa/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/fa/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/fi/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/fi/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/fr/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/fr/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/fur/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/fur/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/gl/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/gl/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/he/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/he/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/hi/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/hi/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/hr/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/hr/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/hu/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/hu/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/id/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/id/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/it/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/it/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ja/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ja/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ka/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ka/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ko/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ko/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ku/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ku/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/lt/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/lt/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/lv/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/lv/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/mk/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/mk/LC_MESSAGES/update-manager.mo differ Only in 20061023.1721/mo: mr Binary files 20061016.2032/mo/ms/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ms/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/nb/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/nb/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ne/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ne/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/nl/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/nl/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/nn/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/nn/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/no/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/no/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/oc/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/oc/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/pa/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/pa/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/pl/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/pl/LC_MESSAGES/update-manager.mo differ Only in 20061023.1721/mo: ps Binary files 20061016.2032/mo/pt/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/pt/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/pt_BR/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/pt_BR/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/qu/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/qu/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ro/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ro/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ru/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ru/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/rw/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/rw/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/sk/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/sk/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/sl/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/sl/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/sq/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/sq/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/sr/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/sr/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/sv/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/sv/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ta/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ta/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/th/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/th/LC_MESSAGES/update-manager.mo differ Only in 20061023.1721/mo: tl Binary files 20061016.2032/mo/tr/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/tr/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/uk/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/uk/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/ur/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/ur/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/urd/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/urd/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/vi/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/vi/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/xh/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/xh/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/zh_CN/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/zh_CN/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/zh_HK/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/zh_HK/LC_MESSAGES/update-manager.mo differ Binary files 20061016.2032/mo/zh_TW/LC_MESSAGES/update-manager.mo and 20061023.1721/mo/zh_TW/LC_MESSAGES/update-manager.mo differ