From 73050c16039e2adc3cb09b522a0ef36de450737e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Jul 2011 11:52:05 +0200 Subject: * add missing bits for the xz compression support for the 0.7 API, thanks to Colin Watson for the fix! (LP: #805389) * backport xz compression support the debian-sid bzr branch (LP: #805389) * apt/utils.py: - fix end date calculation for releases in june (LP: #602469) * apt/package.py: - Fix the changelog downloading if there are several source package versions available which provide the binary (LP: #377535). See http://bugs.debian.org/581831 for further details * debian/control: - update Vcs-Bzr location --- debian/changelog | 35 +++++++++++++++++++++++++++++++++++ doc/source/library/apt_inst.rst | 6 +++--- python/tar.cc | 2 ++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index edd0081f..48ef958d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.0~exp4ubuntu2) UNRELEASED; urgency=low + + * add missing bits for the xz compression support for the + 0.7 API, thanks to Colin Watson for the fix! (LP: #805389) + + -- Michael Vogt Wed, 13 Jul 2011 11:51:47 +0200 + python-apt (0.8.0~exp4ubuntu1) oneiric; urgency=low * Merged from debian/experimental, remaining changes: @@ -682,6 +689,34 @@ python-apt (0.7.94.2ubuntu7) maverick; urgency=low -- Colin Watson Sun, 09 May 2010 13:17:03 +0200 +python-apt (0.7.94.2ubuntu6.3) lucid-proposed; urgency=low + + * backport xz compression support the debian-sid bzr branch + (LP: #805389) + + -- Michael Vogt Thu, 07 Jul 2011 10:59:49 +0200 + +python-apt (0.7.94.2ubuntu6.2) lucid-proposed; urgency=low + + * apt/utils.py: + - fix end date calculation for releases in june (LP: #602469) + + -- Jean-Baptiste Lallement Tue, 06 Jul 2010 23:46:49 +0200 + +python-apt (0.7.94.2ubuntu6.1) lucid-proposed; urgency=low + + [ Sebastian Heinlein ] + * apt/package.py: + - Fix the changelog downloading if there are several source package + versions available which provide the binary (LP: #377535). + See http://bugs.debian.org/581831 for further details + + [ Michael Vogt ] + * debian/control: + - update Vcs-Bzr location + + -- Michael Vogt Mon, 17 May 2010 15:37:44 +0200 + python-apt (0.7.94.2ubuntu6) lucid; urgency=low Cherry pick fix from the debian branch: diff --git a/doc/source/library/apt_inst.rst b/doc/source/library/apt_inst.rst index d9403a9e..9e6772f5 100644 --- a/doc/source/library/apt_inst.rst +++ b/doc/source/library/apt_inst.rst @@ -134,8 +134,8 @@ Debian Packages .. attribute:: data - The :class:`TarFile` object associated with the data.tar.{gz,bz2,lzma} - member. + The :class:`TarFile` object associated with the + data.tar.{gz,bz2,lzma,xz} member. .. attribute:: debian_binary @@ -307,7 +307,7 @@ function can be replaced. Call the function *func* for each member of the tar file *file*. The parameter *comp* is a string determining the compressor used. Possible - options are "lzma", "bzip2" and "gzip". The parameter *file* may be + options are "xz", "lzma", "bzip2" and "gzip". The parameter *file* may be a :class:`file()` object, a file descriptor, or anything implementing a :meth:`fileno` method. diff --git a/python/tar.cc b/python/tar.cc index b994d4e7..e42a9c50 100644 --- a/python/tar.cc +++ b/python/tar.cc @@ -182,6 +182,8 @@ PyObject *debExtract(PyObject *Self,PyObject *Args) Comp = "bzip2"; else if(strcmp(".lzma", &Chunk[strlen(Chunk)-5]) == 0) Comp = "lzma"; + else if(strcmp(".xz", &Chunk[strlen(Chunk)-3]) == 0) + Comp = "xz"; ExtractTar Tar(Deb.GetFile(),Member->Size,Comp); ProcessTar Proc(Function); if (Tar.Go(Proc) == false) -- cgit v1.2.3