diff -Nru update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py --- update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2007-10-01 19:53:05.000000000 +0200 +++ update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2007-12-17 15:34:40.000000000 +0100 @@ -389,11 +389,15 @@ def distUpgrade(self, view, serverMode, logfd): def _restore_fds(stdout, stderr): + apt_pkg.Config.Set("Debug::pkgProblemResolver","false") + apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","false") os.dup2(stdout, 1) os.dup2(stderr, 2) text_mode = (isinstance(view, DistUpgradeViewText) or isinstance(view, DistUpgradeViewNonInteractive)) if text_mode: + apt_pkg.Config.Set("Debug::pkgProblemResolver","true") + apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true") old_stdout = os.dup(1) old_stderr = os.dup(2) os.dup2(logfd, 1) diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg /tmp/YDvIuLpOEg/update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg --- update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 2007-11-30 15:56:58.000000000 +0100 +++ update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 2007-12-17 14:53:51.000000000 +0100 @@ -62,8 +62,8 @@ [PreRequists] Packages=release-upgrader-apt,release-upgrader-dpkg SourcesList=prerequists-sources.list -SourcesList-ia64=prerequists-sources.list.ports -SourcesList-hppa=prerequists-sources.list.ports +SourcesList-ia64=prerequists-sources.ports.list +SourcesList-hppa=prerequists-sources.ports.list [Network] MaxRetries=3 diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/prerequists-sources.list.ports /tmp/YDvIuLpOEg/update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/prerequists-sources.list.ports --- update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/prerequists-sources.list.ports 2007-11-30 15:56:13.000000000 +0100 +++ update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/prerequists-sources.list.ports 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# sources.list fragment for pre-requists of arches living on ports.ubuntu.com -deb http://ports.ubuntu.com/ feisty-backports main/debian-installer diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/prerequists-sources.ports.list /tmp/YDvIuLpOEg/update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/prerequists-sources.ports.list --- update-manager-0.81.1/AutoUpgradeTester/DistUpgrade/prerequists-sources.ports.list 1970-01-01 01:00:00.000000000 +0100 +++ update-manager-0.81.2/AutoUpgradeTester/DistUpgrade/prerequists-sources.ports.list 2007-12-17 14:46:13.000000000 +0100 @@ -0,0 +1,2 @@ +# sources.list fragment for pre-requists of arches living on ports.ubuntu.com +deb http://ports.ubuntu.com/ubuntu-ports feisty-backports main/debian-installer diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/debian/changelog /tmp/YDvIuLpOEg/update-manager-0.81.2/debian/changelog --- update-manager-0.81.1/debian/changelog 2007-11-30 16:03:56.000000000 +0100 +++ update-manager-0.81.2/debian/changelog 2007-12-17 15:34:54.000000000 +0100 @@ -1,3 +1,11 @@ +update-manager (1:0.81.2) gutsy-proposed; urgency=low + + * fix incorrect prerequists sources.list name + (LP: #172609) + * write apt.log information in server mode + + -- Michael Vogt Mon, 17 Dec 2007 14:45:36 +0100 + update-manager (1:0.81.1) gutsy-proposed; urgency=low * Fix PreRequists fetching for ia64 and hppa (LP: #172609) diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/DistUpgrade/DistUpgradeCache.py /tmp/YDvIuLpOEg/update-manager-0.81.2/DistUpgrade/DistUpgradeCache.py --- update-manager-0.81.1/DistUpgrade/DistUpgradeCache.py 2007-10-01 19:53:05.000000000 +0200 +++ update-manager-0.81.2/DistUpgrade/DistUpgradeCache.py 2007-12-17 15:34:40.000000000 +0100 @@ -389,11 +389,15 @@ def distUpgrade(self, view, serverMode, logfd): def _restore_fds(stdout, stderr): + apt_pkg.Config.Set("Debug::pkgProblemResolver","false") + apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","false") os.dup2(stdout, 1) os.dup2(stderr, 2) text_mode = (isinstance(view, DistUpgradeViewText) or isinstance(view, DistUpgradeViewNonInteractive)) if text_mode: + apt_pkg.Config.Set("Debug::pkgProblemResolver","true") + apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true") old_stdout = os.dup(1) old_stderr = os.dup(2) os.dup2(logfd, 1) diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/DistUpgrade/DistUpgrade.cfg /tmp/YDvIuLpOEg/update-manager-0.81.2/DistUpgrade/DistUpgrade.cfg --- update-manager-0.81.1/DistUpgrade/DistUpgrade.cfg 2007-11-30 15:56:58.000000000 +0100 +++ update-manager-0.81.2/DistUpgrade/DistUpgrade.cfg 2007-12-17 14:53:51.000000000 +0100 @@ -62,8 +62,8 @@ [PreRequists] Packages=release-upgrader-apt,release-upgrader-dpkg SourcesList=prerequists-sources.list -SourcesList-ia64=prerequists-sources.list.ports -SourcesList-hppa=prerequists-sources.list.ports +SourcesList-ia64=prerequists-sources.ports.list +SourcesList-hppa=prerequists-sources.ports.list [Network] MaxRetries=3 diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/DistUpgrade/prerequists-sources.list.ports /tmp/YDvIuLpOEg/update-manager-0.81.2/DistUpgrade/prerequists-sources.list.ports --- update-manager-0.81.1/DistUpgrade/prerequists-sources.list.ports 2007-11-30 15:56:13.000000000 +0100 +++ update-manager-0.81.2/DistUpgrade/prerequists-sources.list.ports 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# sources.list fragment for pre-requists of arches living on ports.ubuntu.com -deb http://ports.ubuntu.com/ feisty-backports main/debian-installer diff -Nru /tmp/mfTd6RePDs/update-manager-0.81.1/DistUpgrade/prerequists-sources.ports.list /tmp/YDvIuLpOEg/update-manager-0.81.2/DistUpgrade/prerequists-sources.ports.list --- update-manager-0.81.1/DistUpgrade/prerequists-sources.ports.list 1970-01-01 01:00:00.000000000 +0100 +++ update-manager-0.81.2/DistUpgrade/prerequists-sources.ports.list 2007-12-17 14:46:13.000000000 +0100 @@ -0,0 +1,2 @@ +# sources.list fragment for pre-requists of arches living on ports.ubuntu.com +deb http://ports.ubuntu.com/ubuntu-ports feisty-backports main/debian-installer