diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-10-21 09:10:46 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-10-21 09:10:46 +0200 |
| commit | 50756e0efb5081d3379fa874ca41ab57bdf2798d (patch) | |
| tree | 792ea54a45991d98ba9c03a1974888e15c1630f0 | |
| parent | f17fc818cca41668bb6358e490ff3278e64fa493 (diff) | |
| download | python-apt-50756e0efb5081d3379fa874ca41ab57bdf2798d.tar.gz | |
* tests/test_aptsources.py:
- use unlzma from xz-utils instead of lzma to follow what dpkg
is using (LP: #868188)
* debian/control:
- add recommends to xz-lzma to ensure we have the unlzma command
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | python/tar.cc | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b7876e51..33b0d6e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,11 @@ python-apt (0.8.1) UNRELEASED; urgency=low * tests/test_apt_cache.py: - add __cmp__ to apt.Package so that sort() sorts by name on list of package objects + * tests/test_aptsources.py: + - use unlzma from xz-utils instead of lzma to follow what dpkg + is using (LP: #868188) + * debian/control: + - add recommends to xz-lzma to ensure we have the unlzma command -- Julian Andres Klode <jak@debian.org> Tue, 07 Jun 2011 14:00:22 +0200 diff --git a/debian/control b/debian/control index 01e8884e..541e4c36 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common -Recommends: lsb-release, iso-codes, python2.6 +Recommends: lsb-release, iso-codes, python2.6, xz-lzma Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), computer-janitor (<< 1.14.1-1+), debdelta (<< 0.41+), diff --git a/python/tar.cc b/python/tar.cc index b994d4e7..4109776c 100644 --- a/python/tar.cc +++ b/python/tar.cc @@ -181,7 +181,7 @@ PyObject *debExtract(PyObject *Self,PyObject *Args) if (strcmp(".bz2", &Chunk[strlen(Chunk)-4]) == 0) Comp = "bzip2"; else if(strcmp(".lzma", &Chunk[strlen(Chunk)-5]) == 0) - Comp = "lzma"; + Comp = "unlzma"; ExtractTar Tar(Deb.GetFile(),Member->Size,Comp); ProcessTar Proc(Function); if (Tar.Go(Proc) == false) |
