diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid 2012-03-13 14:50:49.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid 2012-03-20 16:37:29.000000000 +0000 @@ -73,6 +73,7 @@ groovy groovy-doc gs-common +gtk2-engines-pixbuf gtk2-engines-qtcurve hal hal-doc @@ -94,6 +95,7 @@ kdewallpapers kfloppy kipi-plugins +kmozillahelper kpackagekit krb5-user kwin-style-qtcurve @@ -196,6 +198,11 @@ libgeronimo-jacc-1.1-spec-java libgeronimo-jpa-3.0-spec-java libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgmp3c2 libgnome-keyring1.0-cil @@ -403,7 +410,6 @@ python-desktopcouch python-desktopcouch-records python-eggtrayicon -python-farsight python-fontforge python-gamin python-gksu2 diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2012-03-13 14:20:38.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2012-03-20 15:52:36.000000000 +0000 @@ -521,8 +521,12 @@ def getKernelsFromBaseInstaller(self): """get the list of recommended kernels from base-installer""" - kernels = Popen(["/bin/sh", "./get_kernel_list.sh"], - stdout=PIPE).communicate()[0] + p = Popen(["/bin/sh", "./get_kernel_list.sh"], stdout=PIPE) + res = p.wait() + if res != 0: + logging.warn("./get_kernel_list.sh returned non-zero exitcode") + return "" + kernels = p.communicate()[0] kernels = filter(lambda x : len(x) > 0, map(string.strip, kernels.split("\n"))) logging.debug("./get_kernel_list.sh returns: %s" % kernels) @@ -535,7 +539,7 @@ # check if we have a kernel from that list installed first kernels = self.getKernelsFromBaseInstaller() for kernel in kernels: - if not self.has_key(kernel): + if not kernel in self: logging.debug("%s not available in cache" % kernel) continue # this can happen e.g. on cdrom -> cdrom only upgrades @@ -552,9 +556,25 @@ return # if we have not found a kernel yet, use the first one that installs for kernel in kernels: - if self.mark_install(kernel, "Selecting new kernel from base-installer"): + if self.mark_install(kernel, + "Selecting new kernel from base-installer"): + if self._has_kernel_headers_installed(): + prefix, sep, postfix = kernel.partition("-") + headers = "%s-header-%s" % (prefix, postfix) + self.mark_install( + headers, + "Selecting new kernel headers from base-installer") + else: + logging.debug("no kernel-headers installed") return + def _has_kernel_headers_installed(self): + for pkg in self: + if (pkg.name.startswith("linux-headers-") and + pkg.is_installed): + return True + return False + def checkForKernel(self): """ check for the running kernel and try to ensure that we have an updated version diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 2012-03-05 08:21:59.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 2012-03-20 10:24:32.000000000 +0000 @@ -34,7 +34,7 @@ #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ [KernelRemoval] -Version=2.6.35 +Version=3.0.0 BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm Types=386,ec2,generic,rt,server,virtual diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid 2012-03-05 08:00:46.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid 2012-03-20 10:25:45.000000000 +0000 @@ -36,7 +36,7 @@ ;AllowUnauthenticated=yes [KernelRemoval] -Version=2.6.35 +Version=2.6.32 BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm Types=386,ec2,generic,rt,server,virtual diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py 2012-03-05 08:00:46.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py 2012-03-15 16:41:44.000000000 +0000 @@ -1044,6 +1044,12 @@ # check if we want apport running during the upgrade if self.config.getWithDefault("Distro","EnableApport", False): self.enableApport() + + # add debug code only here + #apt_pkg.config.set("Debug::pkgDpkgPM", "1") + #apt_pkg.config.set("Debug::pkgOrderList", "1") + #apt_pkg.config.set("Debug::pkgPackageManager", "1") + # get the upgrade currentRetry = 0 fprogress = self._view.getFetchProgress() @@ -1054,9 +1060,11 @@ self.quirks.run("StartUpgrade") # FIXME: take this into account for diskspace calculation self._maybe_create_apt_btrfs_snapshot() + res = False while currentRetry < maxRetries: try: - self.cache.commit(fprogress,iprogress) + res = self.cache.commit(fprogress,iprogress) + logging.debug("cache.commit() returned %s" % res) except SystemError, e: logging.error("SystemError from cache.commit(): %s" % e) # if its a ordering bug we can cleanly revert to @@ -1435,14 +1443,30 @@ p = os.path.join(self.aptcdrom.cdrompath, "dists/stable/main/dist-upgrader/binary-%s/" % apt_pkg.Config.find("APT::Architecture")) found_pkgs = set() - for udeb in glob.glob(p+"*_*.udeb"): - logging.debug("copying pre-req '%s' to '%s'" % (udeb, backportsdir)) - found_pkgs.add(os.path.basename(udeb).split("_")[0]) - shutil.copy(udeb, backportsdir) + for deb in glob.glob(p+"*_*.deb"): + logging.debug("found pre-req '%s' to '%s'" % (deb, backportsdir)) + found_pkgs.add(os.path.basename(deb).split("_")[0]) # now check if we got all backports on the CD if not set(backportslist) == found_pkgs: logging.error("Expected backports: '%s' but got '%s'" % (set(backportslist), found_pkgs)) return False + # now install them + self.cache.releaseLock() + p = subprocess.Popen( + ["/usr/bin/dpkg", "-i", ] + glob.glob(p+"*_*.deb"), + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + res = None + while res is None: + res = p.poll() + self._view.pulseProgress() + time.sleep(0.02) + self._view.pulseProgress(finished=True) + self.cache.getLock() + logging.info("installing backport debs exit code '%s'" % res) + logging.debug("dpkg output:\n%s" % p.communicate()[0]) + if res != 0: + return False + # and re-start itself when it done return self.setupRequiredBackports() # we support PreRequists/SourcesList-$arch sections here too diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 2012-03-13 14:51:33.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 2012-03-20 16:38:02.000000000 +0000 @@ -1 +1 @@ -VERSION='0.156.8' +VERSION='0.156.9' diff -Nru update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/mirrors.cfg update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/mirrors.cfg --- update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/mirrors.cfg 2012-03-13 14:50:58.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/DistUpgrade/mirrors.cfg 2012-03-20 16:37:39.000000000 +0000 @@ -692,7 +692,6 @@ http://mirror.telepoint.bg/ubuntu/ http://mirror.timeweb.ru/ubuntu/ http://mirror.umd.edu/ubuntu/ -http://mirror.unesp.br/ubuntu/ http://mirror.unix-solutions.be/ubuntu/ http://mirror.uoregon.edu/ubuntu/ http://mirror01.th.ifl.net/ubuntu/ @@ -709,6 +708,7 @@ http://mirrors.mit.edu/ubuntu/ http://mirrors.psu.ac.th/pub/ubuntu/ http://mirrors.sohu.com/ubuntu/ +http://mirrors.tecnoera.com/ubuntu/ http://mirrors.telianet.dk/ubuntu/ http://mirrors.uaip.org/ubuntu/ http://mirrors.ustc.edu.cn/ubuntu/ @@ -721,6 +721,7 @@ http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/ http://tux.rainside.sk/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ +http://ubuntu-mirror.telesys.org.ua/ubuntu/ http://ubuntu.arcticnetwork.ca/ http://ubuntu.cs.nctu.edu.tw/ubuntu/ http://ubuntu.cybercomhosting.com/ubuntu/ @@ -744,11 +745,11 @@ http://ubuntu.wikimedia.org/ubuntu/ http://ucmirror.canterbury.ac.nz/ubuntu/ http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ +http://www.club.cc.cmu.edu/pub/ubuntu/ http://ubuntu-archive.adsolux.com/ubuntu/ http://archive.ubuntu.nautile.nc/ubuntu/ http://biruni.upm.my/mirror/ubuntu/ http://cosmos.cites.illinois.edu/pub/ubuntu/ -http://dafi.inf.um.es/ubuntu/ http://deis-mirrors.isec.pt/ubuntu/ http://mirror.fcaglp.unlp.edu.ar/ubuntu/ http://ftp.arnes.si/pub/mirrors/ubuntu/ @@ -771,7 +772,9 @@ http://mirror.hosef.org/ubuntu/ http://mirror.its.dal.ca/ubuntu/ http://mirror.learn.ac.lk/ubuntu/ +http://mirror.linux.org.au/ubuntu/ http://mirror.neolabs.kz/ubuntu/ +ftp://mirror.space.kz/ubuntu/ http://mirror.squ.edu.om/ubuntuarchive/ http://mirrors.bloomu.edu/ubuntu/ http://mirrors.ispros.com.bd/ubuntu/ @@ -806,7 +809,6 @@ http://buaya.klas.or.id/ubuntu/ http://ftp.leg.uct.ac.za/ubuntu/ http://kartolo.sby.datautama.net.id/ubuntu/ -http://mirror.calvin.edu/ubuntu/ http://mirror.vcu.edu/pub/gnu+linux/ubuntu/ http://mirror.waia.asn.au/ubuntu/ ftp://mirror1.cs.washington.edu/ubuntu/ diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/lts-main-all/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/lts-main-all/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/main-all/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/main-all/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/main-all/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/main-all/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/server/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/server/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/server/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/server/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/ubuntu/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/ubuntu/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/universe-amd64/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/universe-amd64/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/AutoUpgradeTester/profile/universe-i386/demoted.cfg update-manager-0.156.9/AutoUpgradeTester/profile/universe-i386/demoted.cfg --- update-manager-0.156.8/AutoUpgradeTester/profile/universe-i386/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/AutoUpgradeTester/profile/universe-i386/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/data/release-upgrades update-manager-0.156.9/data/release-upgrades --- update-manager-0.156.8/data/release-upgrades 2012-03-05 08:00:46.000000000 +0000 +++ update-manager-0.156.9/data/release-upgrades 2012-03-20 14:10:23.000000000 +0000 @@ -14,4 +14,4 @@ # used if the currently-running release is not itself an LTS # release, since in that case the upgrader won't be able to # determine if a newer release is available. -Prompt=normal +Prompt=lts diff -Nru update-manager-0.156.8/debian/changelog update-manager-0.156.9/debian/changelog --- update-manager-0.156.8/debian/changelog 2012-03-13 14:30:04.000000000 +0000 +++ update-manager-0.156.9/debian/changelog 2012-03-20 16:35:34.000000000 +0000 @@ -1,3 +1,26 @@ +update-manager (1:0.156.9) precise; urgency=low + + [ Michael Vogt ] + * DistUpgrade/DistUpgradeController.py: + - support cdrom-only upgrades properly by using the backported + libapt-{pkg,inst} and release-upgrader-python-apt from the CD + * DistUpgrade/DistUpgrade.cfg: + - update KernelRemoval/Version to match oneirics kernel + * DistUpgrade/DistUpgrade.cfg.lucid: + - update KernelRemoval/Version to match lucids kernel + * data/release-upgrades: + - set releae upgrades default to "lts" + + [ Brian Murray ] + * debian/source_update-manager.py: pass if attach_gsettings fails like on a + server + + [ Gabor Kelemen ] + * lp:~kelemeng/update-manager/bug957552: + - Mark two accessible descriptions for translation. LP: #957552 + + -- Michael Vogt Tue, 20 Mar 2012 17:35:34 +0100 + update-manager (1:0.156.8) precise; urgency=low [ Robert Roth ] diff -Nru update-manager-0.156.8/debian/source_update-manager.py update-manager-0.156.9/debian/source_update-manager.py --- update-manager-0.156.8/debian/source_update-manager.py 2012-03-05 08:00:46.000000000 +0000 +++ update-manager-0.156.9/debian/source_update-manager.py 2012-03-20 10:17:16.000000000 +0000 @@ -12,7 +12,10 @@ def add_info(report, ui): - attach_gsettings_package(report, 'update-manager') + try: + attach_gsettings_package(report, 'update-manager') + except: + pass response = ui.yesno("Is the issue you are reporting one you encountered when upgrading Ubuntu from one release to another?") if response: report.setdefault('Tags', 'dist-upgrade') diff -Nru update-manager-0.156.8/DistUpgrade/demoted.cfg update-manager-0.156.9/DistUpgrade/demoted.cfg --- update-manager-0.156.8/DistUpgrade/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/DistUpgrade/demoted.cfg.lucid update-manager-0.156.9/DistUpgrade/demoted.cfg.lucid --- update-manager-0.156.8/DistUpgrade/demoted.cfg.lucid 2012-03-13 14:50:49.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/demoted.cfg.lucid 2012-03-20 16:37:29.000000000 +0000 @@ -73,6 +73,7 @@ groovy groovy-doc gs-common +gtk2-engines-pixbuf gtk2-engines-qtcurve hal hal-doc @@ -94,6 +95,7 @@ kdewallpapers kfloppy kipi-plugins +kmozillahelper kpackagekit krb5-user kwin-style-qtcurve @@ -196,6 +198,11 @@ libgeronimo-jacc-1.1-spec-java libgeronimo-jpa-3.0-spec-java libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgmp3c2 libgnome-keyring1.0-cil @@ -403,7 +410,6 @@ python-desktopcouch python-desktopcouch-records python-eggtrayicon -python-farsight python-fontforge python-gamin python-gksu2 diff -Nru update-manager-0.156.8/DistUpgrade/DistUpgradeCache.py update-manager-0.156.9/DistUpgrade/DistUpgradeCache.py --- update-manager-0.156.8/DistUpgrade/DistUpgradeCache.py 2012-03-13 14:20:38.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/DistUpgradeCache.py 2012-03-20 15:52:36.000000000 +0000 @@ -521,8 +521,12 @@ def getKernelsFromBaseInstaller(self): """get the list of recommended kernels from base-installer""" - kernels = Popen(["/bin/sh", "./get_kernel_list.sh"], - stdout=PIPE).communicate()[0] + p = Popen(["/bin/sh", "./get_kernel_list.sh"], stdout=PIPE) + res = p.wait() + if res != 0: + logging.warn("./get_kernel_list.sh returned non-zero exitcode") + return "" + kernels = p.communicate()[0] kernels = filter(lambda x : len(x) > 0, map(string.strip, kernels.split("\n"))) logging.debug("./get_kernel_list.sh returns: %s" % kernels) @@ -535,7 +539,7 @@ # check if we have a kernel from that list installed first kernels = self.getKernelsFromBaseInstaller() for kernel in kernels: - if not self.has_key(kernel): + if not kernel in self: logging.debug("%s not available in cache" % kernel) continue # this can happen e.g. on cdrom -> cdrom only upgrades @@ -552,9 +556,25 @@ return # if we have not found a kernel yet, use the first one that installs for kernel in kernels: - if self.mark_install(kernel, "Selecting new kernel from base-installer"): + if self.mark_install(kernel, + "Selecting new kernel from base-installer"): + if self._has_kernel_headers_installed(): + prefix, sep, postfix = kernel.partition("-") + headers = "%s-header-%s" % (prefix, postfix) + self.mark_install( + headers, + "Selecting new kernel headers from base-installer") + else: + logging.debug("no kernel-headers installed") return + def _has_kernel_headers_installed(self): + for pkg in self: + if (pkg.name.startswith("linux-headers-") and + pkg.is_installed): + return True + return False + def checkForKernel(self): """ check for the running kernel and try to ensure that we have an updated version diff -Nru update-manager-0.156.8/DistUpgrade/DistUpgrade.cfg update-manager-0.156.9/DistUpgrade/DistUpgrade.cfg --- update-manager-0.156.8/DistUpgrade/DistUpgrade.cfg 2012-03-05 08:21:59.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/DistUpgrade.cfg 2012-03-20 10:24:32.000000000 +0000 @@ -34,7 +34,7 @@ #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ [KernelRemoval] -Version=2.6.35 +Version=3.0.0 BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm Types=386,ec2,generic,rt,server,virtual diff -Nru update-manager-0.156.8/DistUpgrade/DistUpgrade.cfg.lucid update-manager-0.156.9/DistUpgrade/DistUpgrade.cfg.lucid --- update-manager-0.156.8/DistUpgrade/DistUpgrade.cfg.lucid 2012-03-05 08:00:46.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/DistUpgrade.cfg.lucid 2012-03-20 10:25:45.000000000 +0000 @@ -36,7 +36,7 @@ ;AllowUnauthenticated=yes [KernelRemoval] -Version=2.6.35 +Version=2.6.32 BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm Types=386,ec2,generic,rt,server,virtual diff -Nru update-manager-0.156.8/DistUpgrade/DistUpgradeController.py update-manager-0.156.9/DistUpgrade/DistUpgradeController.py --- update-manager-0.156.8/DistUpgrade/DistUpgradeController.py 2012-03-05 08:00:46.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/DistUpgradeController.py 2012-03-15 16:41:44.000000000 +0000 @@ -1044,6 +1044,12 @@ # check if we want apport running during the upgrade if self.config.getWithDefault("Distro","EnableApport", False): self.enableApport() + + # add debug code only here + #apt_pkg.config.set("Debug::pkgDpkgPM", "1") + #apt_pkg.config.set("Debug::pkgOrderList", "1") + #apt_pkg.config.set("Debug::pkgPackageManager", "1") + # get the upgrade currentRetry = 0 fprogress = self._view.getFetchProgress() @@ -1054,9 +1060,11 @@ self.quirks.run("StartUpgrade") # FIXME: take this into account for diskspace calculation self._maybe_create_apt_btrfs_snapshot() + res = False while currentRetry < maxRetries: try: - self.cache.commit(fprogress,iprogress) + res = self.cache.commit(fprogress,iprogress) + logging.debug("cache.commit() returned %s" % res) except SystemError, e: logging.error("SystemError from cache.commit(): %s" % e) # if its a ordering bug we can cleanly revert to @@ -1435,14 +1443,30 @@ p = os.path.join(self.aptcdrom.cdrompath, "dists/stable/main/dist-upgrader/binary-%s/" % apt_pkg.Config.find("APT::Architecture")) found_pkgs = set() - for udeb in glob.glob(p+"*_*.udeb"): - logging.debug("copying pre-req '%s' to '%s'" % (udeb, backportsdir)) - found_pkgs.add(os.path.basename(udeb).split("_")[0]) - shutil.copy(udeb, backportsdir) + for deb in glob.glob(p+"*_*.deb"): + logging.debug("found pre-req '%s' to '%s'" % (deb, backportsdir)) + found_pkgs.add(os.path.basename(deb).split("_")[0]) # now check if we got all backports on the CD if not set(backportslist) == found_pkgs: logging.error("Expected backports: '%s' but got '%s'" % (set(backportslist), found_pkgs)) return False + # now install them + self.cache.releaseLock() + p = subprocess.Popen( + ["/usr/bin/dpkg", "-i", ] + glob.glob(p+"*_*.deb"), + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + res = None + while res is None: + res = p.poll() + self._view.pulseProgress() + time.sleep(0.02) + self._view.pulseProgress(finished=True) + self.cache.getLock() + logging.info("installing backport debs exit code '%s'" % res) + logging.debug("dpkg output:\n%s" % p.communicate()[0]) + if res != 0: + return False + # and re-start itself when it done return self.setupRequiredBackports() # we support PreRequists/SourcesList-$arch sections here too diff -Nru update-manager-0.156.8/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.9/DistUpgrade/DistUpgradeVersion.py --- update-manager-0.156.8/DistUpgrade/DistUpgradeVersion.py 2012-03-13 14:51:33.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/DistUpgradeVersion.py 2012-03-20 16:38:02.000000000 +0000 @@ -1 +1 @@ -VERSION='0.156.8' +VERSION='0.156.9' diff -Nru update-manager-0.156.8/DistUpgrade/mirrors.cfg update-manager-0.156.9/DistUpgrade/mirrors.cfg --- update-manager-0.156.8/DistUpgrade/mirrors.cfg 2012-03-13 14:50:58.000000000 +0000 +++ update-manager-0.156.9/DistUpgrade/mirrors.cfg 2012-03-20 16:37:39.000000000 +0000 @@ -692,7 +692,6 @@ http://mirror.telepoint.bg/ubuntu/ http://mirror.timeweb.ru/ubuntu/ http://mirror.umd.edu/ubuntu/ -http://mirror.unesp.br/ubuntu/ http://mirror.unix-solutions.be/ubuntu/ http://mirror.uoregon.edu/ubuntu/ http://mirror01.th.ifl.net/ubuntu/ @@ -709,6 +708,7 @@ http://mirrors.mit.edu/ubuntu/ http://mirrors.psu.ac.th/pub/ubuntu/ http://mirrors.sohu.com/ubuntu/ +http://mirrors.tecnoera.com/ubuntu/ http://mirrors.telianet.dk/ubuntu/ http://mirrors.uaip.org/ubuntu/ http://mirrors.ustc.edu.cn/ubuntu/ @@ -721,6 +721,7 @@ http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/ http://tux.rainside.sk/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ +http://ubuntu-mirror.telesys.org.ua/ubuntu/ http://ubuntu.arcticnetwork.ca/ http://ubuntu.cs.nctu.edu.tw/ubuntu/ http://ubuntu.cybercomhosting.com/ubuntu/ @@ -744,11 +745,11 @@ http://ubuntu.wikimedia.org/ubuntu/ http://ucmirror.canterbury.ac.nz/ubuntu/ http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ +http://www.club.cc.cmu.edu/pub/ubuntu/ http://ubuntu-archive.adsolux.com/ubuntu/ http://archive.ubuntu.nautile.nc/ubuntu/ http://biruni.upm.my/mirror/ubuntu/ http://cosmos.cites.illinois.edu/pub/ubuntu/ -http://dafi.inf.um.es/ubuntu/ http://deis-mirrors.isec.pt/ubuntu/ http://mirror.fcaglp.unlp.edu.ar/ubuntu/ http://ftp.arnes.si/pub/mirrors/ubuntu/ @@ -771,7 +772,9 @@ http://mirror.hosef.org/ubuntu/ http://mirror.its.dal.ca/ubuntu/ http://mirror.learn.ac.lk/ubuntu/ +http://mirror.linux.org.au/ubuntu/ http://mirror.neolabs.kz/ubuntu/ +ftp://mirror.space.kz/ubuntu/ http://mirror.squ.edu.om/ubuntuarchive/ http://mirrors.bloomu.edu/ubuntu/ http://mirrors.ispros.com.bd/ubuntu/ @@ -806,7 +809,6 @@ http://buaya.klas.or.id/ubuntu/ http://ftp.leg.uct.ac.za/ubuntu/ http://kartolo.sby.datautama.net.id/ubuntu/ -http://mirror.calvin.edu/ubuntu/ http://mirror.vcu.edu/pub/gnu+linux/ubuntu/ http://mirror.waia.asn.au/ubuntu/ ftp://mirror1.cs.washington.edu/ubuntu/ diff -Nru update-manager-0.156.8/tests/test_kernel_from_baseinstaller.py update-manager-0.156.9/tests/test_kernel_from_baseinstaller.py --- update-manager-0.156.8/tests/test_kernel_from_baseinstaller.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.9/tests/test_kernel_from_baseinstaller.py 2012-03-20 11:21:22.000000000 +0000 @@ -0,0 +1,41 @@ +#!/usr/bin/python + +import os +import subprocess +import sys +import unittest + +from mock import Mock,patch + +sys.path.insert(0,"../") +from DistUpgrade.DistUpgradeCache import MyCache +from DistUpgrade.DistUpgradeConfigParser import DistUpgradeConfig + +class TestKernelBaseinstaller(unittest.TestCase): + + def test_kernel_from_baseinstaller(self): + # the upgrade expects this + os.chdir("../DistUpgrade") + # get a config + config = DistUpgradeConfig(".") + config.set("Files", "LogDir", "/tmp") + cache = MyCache(config, None, None, lock=False) + cache._has_kernel_headers_installed = Mock() + cache._has_kernel_headers_installed.return_value = True + cache.getKernelsFromBaseInstaller = Mock() + cache.getKernelsFromBaseInstaller.return_value = \ + ["linux-generic2-pae", "linux-generic2"] + cache.mark_install = Mock() + cache.mark_install.return_value = True + cache._selectKernelFromBaseInstaller() + #print cache.mark_install.call_args + calls = cache.mark_install.call_args_list + self.assertEqual(len(calls), 2) + cache.mark_install.assert_any_call( + "linux-generic2-pae", "Selecting new kernel from base-installer") + cache.mark_install.assert_any_call( + "linux-headers-generic2-pae", "Selecting new kernel headers from base-installer") +if __name__ == "__main__": + import logging + logging.basicConfig(level=logging.DEBUG) + unittest.main() diff -Nru update-manager-0.156.8/UpdateManager/UpdateManager.py update-manager-0.156.9/UpdateManager/UpdateManager.py --- update-manager-0.156.8/UpdateManager/UpdateManager.py 2012-03-13 14:23:20.000000000 +0000 +++ update-manager-0.156.9/UpdateManager/UpdateManager.py 2012-03-20 10:17:34.000000000 +0000 @@ -223,9 +223,9 @@ cr.set_property("xpad", 6) cr.connect("toggled", self.toggled) - column_install = Gtk.TreeViewColumn("Install", cr, active=LIST_TOGGLE_CHECKED) + column_install = Gtk.TreeViewColumn(_("Install"), cr, active=LIST_TOGGLE_CHECKED) column_install.set_cell_data_func (cr, self.install_column_view_func) - column = Gtk.TreeViewColumn("Name", tr, markup=LIST_CONTENTS) + column = Gtk.TreeViewColumn(_("Name"), tr, markup=LIST_CONTENTS) column.set_resizable(True) column_install.set_sizing(Gtk.TreeViewColumnSizing.FIXED) diff -Nru update-manager-0.156.8/utils/demoted.cfg update-manager-0.156.9/utils/demoted.cfg --- update-manager-0.156.8/utils/demoted.cfg 2012-03-13 14:49:34.000000000 +0000 +++ update-manager-0.156.9/utils/demoted.cfg 2012-03-20 16:36:38.000000000 +0000 @@ -18,6 +18,7 @@ evolution-couchdb evolution-couchdb-backend exiv2 +firefox-kde-support g++-4.5-multilib gamin gbrainy @@ -37,6 +38,7 @@ kdevplatform-dbg kdevplatform-dev kdewallpapers +kmozillahelper koffice-l10n-ca koffice-l10n-cavalencia koffice-l10n-da @@ -106,6 +108,11 @@ libgkeyfile1.0-cil libgladeui-1-11 libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgo0 libgo0-dbg @@ -121,7 +128,9 @@ libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 +libllvm-2.8-ocaml-dev libllvm-2.9-ocaml-dev +libllvm2.8 libllvm2.9 liblpsolve55-dev libmodplug-dev @@ -184,6 +193,10 @@ libxine1-x linux-wlan-ng linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime llvm-2.9 llvm-2.9-dev llvm-2.9-doc @@ -204,7 +217,6 @@ python-desktopcouch-application python-desktopcouch-records python-desktopcouch-recordtypes -python-farsight python-fontforge python-gamin python-indicate diff -Nru update-manager-0.156.8/utils/demoted.cfg.lucid update-manager-0.156.9/utils/demoted.cfg.lucid --- update-manager-0.156.8/utils/demoted.cfg.lucid 2012-03-13 14:50:49.000000000 +0000 +++ update-manager-0.156.9/utils/demoted.cfg.lucid 2012-03-20 16:37:29.000000000 +0000 @@ -73,6 +73,7 @@ groovy groovy-doc gs-common +gtk2-engines-pixbuf gtk2-engines-qtcurve hal hal-doc @@ -94,6 +95,7 @@ kdewallpapers kfloppy kipi-plugins +kmozillahelper kpackagekit krb5-user kwin-style-qtcurve @@ -196,6 +198,11 @@ libgeronimo-jacc-1.1-spec-java libgeronimo-jpa-3.0-spec-java libgladeui-1-dev +libgmime-2.4-2 +libgmime-2.4-dev +libgmime-2.4-doc +libgmime2.4-cil +libgmime2.4-cil-dev libgmm-dev libgmp3c2 libgnome-keyring1.0-cil @@ -403,7 +410,6 @@ python-desktopcouch python-desktopcouch-records python-eggtrayicon -python-farsight python-fontforge python-gamin python-gksu2