Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock unattended-upgrades to fix
bug #698552: unattended-upgrades - Fails with xz compress debs
The fix is to add missing dependency on xz-utils.
Also a unit tests is added explicitly testing xz compressed deb.
Attaching debdiff.
Regards,
Dmitrijs.
diff -Nru unattended-upgrades-0.79.3/debian/changelog unattended-upgrades-0.79.4/debian/changelog
--- unattended-upgrades-0.79.3/debian/changelog 2012-08-07 11:20:06.000000000 +0100
+++ unattended-upgrades-0.79.4/debian/changelog 2013-01-21 16:29:27.000000000 +0000
@@ -1,3 +1,11 @@
+unattended-upgrades (0.79.4) unstable; urgency=low
+
+ * lp:~mvo/unattended-upgrades/xz-support:
+ - add missing xz-utils dependency, thanks to Bastian Blank
+ (closes: #698552)
+
+ -- Michael Vogt <m...@debian.org> Mon, 21 Jan 2013 17:27:31 +0100
+
unattended-upgrades (0.79.3) unstable; urgency=low
* unattended-upgrade:
diff -Nru unattended-upgrades-0.79.3/debian/control unattended-upgrades-0.79.4/debian/control
--- unattended-upgrades-0.79.3/debian/control 2012-07-13 19:52:54.000000000 +0100
+++ unattended-upgrades-0.79.4/debian/control 2013-01-21 16:29:27.000000000 +0000
@@ -11,7 +11,7 @@
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, python,
python-apt (>= 0.7.90), apt-utils, apt, ucf, lsb-release,
- lsb-base (>= 3.2-14)
+ lsb-base (>= 3.2-14), xz-utils
Suggests: bsd-mailx, mail-transport-agent
Description: automatic installation of security upgrades
This package can download and install security upgrades automatically
diff -Nru unattended-upgrades-0.79.3/test/aptroot/var/log/apt/history.log unattended-upgrades-0.79.4/test/aptroot/var/log/apt/history.log
--- unattended-upgrades-0.79.3/test/aptroot/var/log/apt/history.log 2012-08-07 11:20:17.000000000 +0100
+++ unattended-upgrades-0.79.4/test/aptroot/var/log/apt/history.log 2013-01-21 16:29:47.000000000 +0000
@@ -1,4 +1,4 @@
-Start-Date: 2012-08-07 12:20:17
+Start-Date: 2013-01-21 17:29:47
Upgrade: awstats:amd64 (6.9~dfsg-1ubuntu3, 6.9~dfsg-1ubuntu3.10.04.1), apt-doc:amd64 (0.7.25.3ubuntu9, 0.7.25.3ubuntu9.13)
-End-Date: 2012-08-07 12:20:17
+End-Date: 2013-01-21 17:29:47
diff -Nru unattended-upgrades-0.79.3/test/aptroot/var/log/apt/term.log unattended-upgrades-0.79.4/test/aptroot/var/log/apt/term.log
--- unattended-upgrades-0.79.3/test/aptroot/var/log/apt/term.log 2012-08-07 11:20:17.000000000 +0100
+++ unattended-upgrades-0.79.4/test/aptroot/var/log/apt/term.log 2013-01-21 16:29:47.000000000 +0000
@@ -1,3 +1,3 @@
-Log started: 2012-08-07 12:20:17
-Log ended: 2012-08-07 12:20:17
+Log started: 2013-01-21 17:29:47
+Log ended: 2013-01-21 17:29:47
diff -Nru unattended-upgrades-0.79.3/test/aptroot/var/log/unattended-upgrades.log unattended-upgrades-0.79.4/test/aptroot/var/log/unattended-upgrades.log
--- unattended-upgrades-0.79.3/test/aptroot/var/log/unattended-upgrades.log 2012-08-07 11:20:17.000000000 +0100
+++ unattended-upgrades-0.79.4/test/aptroot/var/log/unattended-upgrades.log 2013-01-21 16:29:47.000000000 +0000
@@ -1,25 +1,27 @@
-2012-08-07 12:20:12,876 INFO Initial blacklisted packages: ant-doc
-2012-08-07 12:20:12,877 INFO Starting unattended upgrades script
-2012-08-07 12:20:12,877 INFO Allowed origins are: ['o=Ubuntu,a=lucid-security']
-2012-08-07 12:20:13,973 DEBUG Checking: ant-doc (["<Origin component:'main' archive:'lucid-updates' origin:'Ubuntu' label:'Ubuntu' site:'archive.ubuntu.com' isTrusted:True>", "<Origin component:'main' archive:'lucid-security' origin:'Ubuntu' label:'Ubuntu' site:'security.ubuntu.com' isTrusted:True>"])
-2012-08-07 12:20:13,975 DEBUG skipping blacklisted package 'ant-doc'
-2012-08-07 12:20:13,976 DEBUG Checking: apt-doc (["<Origin component:'main' archive:'lucid-updates' origin:'Ubuntu' label:'Ubuntu' site:'archive.ubuntu.com' isTrusted:True>", "<Origin component:'main' archive:'lucid-security' origin:'Ubuntu' label:'Ubuntu' site:'security.ubuntu.com' isTrusted:True>"])
-2012-08-07 12:20:14,020 DEBUG Checking: awstats (["<Origin component:'main' archive:'lucid-updates' origin:'Ubuntu' label:'Ubuntu' site:'archive.ubuntu.com' isTrusted:True>", "<Origin component:'main' archive:'lucid-security' origin:'Ubuntu' label:'Ubuntu' site:'security.ubuntu.com' isTrusted:True>"])
-2012-08-07 12:20:14,105 DEBUG pkgs that look like they should be upgraded: apt-doc
+2013-01-21 17:29:45,200 INFO Initial blacklisted packages: ant-doc
+2013-01-21 17:29:45,201 INFO Starting unattended upgrades script
+2013-01-21 17:29:45,202 INFO Allowed origins are: ['o=Ubuntu,a=lucid-security']
+2013-01-21 17:29:45,651 DEBUG adjusting candidate version: '<Version: package:'apt-doc' version:'0.7.25.3ubuntu9.13'>'
+2013-01-21 17:29:45,744 DEBUG Checking: ant-doc (["<Origin component:'main' archive:'lucid-updates' origin:'Ubuntu' label:'Ubuntu' site:'archive.ubuntu.com' isTrusted:True>", "<Origin component:'main' archive:'lucid-security' origin:'Ubuntu' label:'Ubuntu' site:'security.ubuntu.com' isTrusted:True>"])
+2013-01-21 17:29:45,746 DEBUG skipping blacklisted package 'ant-doc'
+2013-01-21 17:29:45,747 DEBUG Checking: apt-doc (["<Origin component:'main' archive:'lucid-security' origin:'Ubuntu' label:'Ubuntu' site:'security.ubuntu.com' isTrusted:True>"])
+2013-01-21 17:29:45,797 DEBUG Checking: awstats (["<Origin component:'main' archive:'lucid-updates' origin:'Ubuntu' label:'Ubuntu' site:'archive.ubuntu.com' isTrusted:True>", "<Origin component:'main' archive:'lucid-security' origin:'Ubuntu' label:'Ubuntu' site:'security.ubuntu.com' isTrusted:True>"])
+2013-01-21 17:29:45,889 DEBUG pkgs that look like they should be upgraded: apt-doc
awstats
-2012-08-07 12:20:17,510 DEBUG fetch.run() result: 0
-2012-08-07 12:20:17,511 DEBUG <apt_pkg.AcquireItem object:Status: 2 Complete: 1 Local: 0 IsTrusted: 1 FileSize: 153246 DestFile:'/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.3/test/aptroot/var/cache/apt/archives/apt-doc_0.7.25.3ubuntu9.13_all.deb' DescURI: 'http://archive.ubuntu.com/ubuntu/pool/main/a/apt/apt-doc_0.7.25.3ubuntu9.13_all.deb' ID:1 ErrorText: ''>
-2012-08-07 12:20:17,515 DEBUG check_conffile_prompt('/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.3/test/aptroot/var/cache/apt/archives/apt-doc_0.7.25.3ubuntu9.13_all.deb')
-2012-08-07 12:20:17,520 DEBUG found pkg: apt-doc
-2012-08-07 12:20:17,522 DEBUG No conffiles in deb '/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.3/test/aptroot/var/cache/apt/archives/apt-doc_0.7.25.3ubuntu9.13_all.deb' (There is no member named 'conffiles')
-2012-08-07 12:20:17,525 DEBUG <apt_pkg.AcquireItem object:Status: 2 Complete: 1 Local: 0 IsTrusted: 1 FileSize: 951338 DestFile:'/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.3/test/aptroot/var/cache/apt/archives/awstats_6.9~dfsg-1ubuntu3.10.04.1_all.deb' DescURI: 'http://archive.ubuntu.com/ubuntu/pool/main/a/awstats/awstats_6.9~dfsg-1ubuntu3.10.04.1_all.deb' ID:2 ErrorText: ''>
-2012-08-07 12:20:17,528 DEBUG check_conffile_prompt('/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.3/test/aptroot/var/cache/apt/archives/awstats_6.9~dfsg-1ubuntu3.10.04.1_all.deb')
-2012-08-07 12:20:17,532 DEBUG found pkg: awstats
-2012-08-07 12:20:17,535 DEBUG blacklist: ['ant-doc']
-2012-08-07 12:20:17,587 DEBUG Checking (blacklist): apt-doc
-2012-08-07 12:20:17,628 DEBUG Checking (blacklist): awstats
-2012-08-07 12:20:17,669 DEBUG InstCount=2 DelCount=0 BrokenCout=0
-2012-08-07 12:20:17,676 INFO Option --dry-run given, *not* performing real actions
-2012-08-07 12:20:17,677 INFO Packages that are upgraded: apt-doc awstats
-2012-08-07 12:20:17,678 INFO Writing dpkg log to '/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.3/test/aptroot/var/log/unattended-upgrades-dpkg_2012-08-07_12:20:17.678406.log'
-2012-08-07 12:20:17,984 INFO All upgrades installed
+2013-01-21 17:29:46,974 DEBUG fetch.run() result: 0
+2013-01-21 17:29:46,975 DEBUG <apt_pkg.AcquireItem object:Status: 2 Complete: 1 Local: 0 IsTrusted: 1 FileSize: 153246 DestFile:'/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.4/test/aptroot/var/cache/apt/archives/apt-doc_0.7.25.3ubuntu9.13_all.deb' DescURI: 'http://security.ubuntu.com/ubuntu/pool/main/a/apt/apt-doc_0.7.25.3ubuntu9.13_all.deb' ID:1 ErrorText: ''>
+2013-01-21 17:29:46,979 DEBUG check_conffile_prompt('/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.4/test/aptroot/var/cache/apt/archives/apt-doc_0.7.25.3ubuntu9.13_all.deb')
+2013-01-21 17:29:46,984 DEBUG found pkg: apt-doc
+2013-01-21 17:29:46,986 DEBUG No conffiles in deb '/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.4/test/aptroot/var/cache/apt/archives/apt-doc_0.7.25.3ubuntu9.13_all.deb' (There is no member named 'conffiles')
+2013-01-21 17:29:46,987 DEBUG <apt_pkg.AcquireItem object:Status: 2 Complete: 1 Local: 0 IsTrusted: 1 FileSize: 951338 DestFile:'/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.4/test/aptroot/var/cache/apt/archives/awstats_6.9~dfsg-1ubuntu3.10.04.1_all.deb' DescURI: 'http://archive.ubuntu.com/ubuntu/pool/main/a/awstats/awstats_6.9~dfsg-1ubuntu3.10.04.1_all.deb' ID:2 ErrorText: ''>
+2013-01-21 17:29:46,989 DEBUG check_conffile_prompt('/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.4/test/aptroot/var/cache/apt/archives/awstats_6.9~dfsg-1ubuntu3.10.04.1_all.deb')
+2013-01-21 17:29:46,992 DEBUG found pkg: awstats
+2013-01-21 17:29:46,995 DEBUG blacklist: ['ant-doc']
+2013-01-21 17:29:47,013 DEBUG adjusting candidate version: '<Version: package:'apt-doc' version:'0.7.25.3ubuntu9.13'>'
+2013-01-21 17:29:47,055 DEBUG Checking (blacklist): apt-doc
+2013-01-21 17:29:47,103 DEBUG Checking (blacklist): awstats
+2013-01-21 17:29:47,151 DEBUG InstCount=2 DelCount=0 BrokenCout=0
+2013-01-21 17:29:47,152 INFO Option --dry-run given, *not* performing real actions
+2013-01-21 17:29:47,153 INFO Packages that are upgraded: apt-doc awstats
+2013-01-21 17:29:47,155 INFO Writing dpkg log to '/home/egon/devel/unattended-upgrades/build-area/unattended-upgrades-0.79.4/test/aptroot/var/log/unattended-upgrades-dpkg_2013-01-21_17:29:47.154043.log'
+2013-01-21 17:29:47,765 INFO All upgrades installed
Binary files /tmp/QQwQqCGZCj/unattended-upgrades-0.79.3/test/packages/conf-test-xz_1.0_all.deb and /tmp/kObYAvwAB3/unattended-upgrades-0.79.4/test/packages/conf-test-xz_1.0_all.deb differ
diff -Nru unattended-upgrades-0.79.3/test/test_conffile.py unattended-upgrades-0.79.4/test/test_conffile.py
--- unattended-upgrades-0.79.3/test/test_conffile.py 2012-06-29 10:26:47.000000000 +0100
+++ unattended-upgrades-0.79.4/test/test_conffile.py 2013-01-21 16:29:27.000000000 +0000
@@ -3,7 +3,6 @@
import apt_pkg
import logging
import unittest
-import sys
from unattended_upgrade import conffile_prompt
@@ -53,6 +52,12 @@
self.assertTrue(conffile_prompt(test_pkg, prefix="./root.conffile"),
"conffile prompt detection incorrect")
+ def test_xz_compression(self):
+ test_pkg = "./packages/conf-test-xz_1.0_all.deb"
+ self.assertFalse(conffile_prompt(test_pkg, prefix="./root.conffile"),
+ "conffile prompt detection incorrect")
+
+
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)
