From 42e104ddb5dfb532d7bed66affbb2c7977684d16 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 30 Mar 2010 12:58:26 +0200 Subject: apt/package.py: Decode using utf-8 in installed_files (LP: #407953). --- apt/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt') diff --git a/apt/package.py b/apt/package.py index 0c026504..32480c39 100644 --- a/apt/package.py +++ b/apt/package.py @@ -955,9 +955,9 @@ class Package(object): """ path = "/var/lib/dpkg/info/%s.list" % self.name try: - file_list = open(path) + file_list = open(path, "rb") try: - return file_list.read().decode().split("\n") + return file_list.read().decode("utf-8").split(u"\n") finally: file_list.close() except EnvironmentError: -- cgit v1.2.3 From 4584144d57d4fe0b857c8e4d79645ffafa44409c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 31 Mar 2010 16:48:21 +0200 Subject: apt/package.py: Fix fetch_source() to work when source name = binary name (LP: #552400). --- apt/package.py | 10 +++++----- debian/changelog | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'apt') diff --git a/apt/package.py b/apt/package.py index 32480c39..817dfd55 100644 --- a/apt/package.py +++ b/apt/package.py @@ -536,13 +536,13 @@ class Version(object): dsc = None record = self._records - src.lookup(record.source_pkg) + source_name = record.source_pkg or self.package.name source_version = record.source_ver or self._cand.ver_str + source_lookup = src.lookup(source_name) - try: - while source_version != src.version: - src.lookup(record.source_pkg) - except AttributeError: + while source_lookup and source_version != src.version: + source_lookup = src.lookup(source_name) + if not source_lookup: raise ValueError("No source for %r" % self) files = list() for md5, size, path, type_ in src.files: diff --git a/debian/changelog b/debian/changelog index 0e494a81..5d287831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-apt (0.7.94.3) UNRELEASED; urgency=low [ Julian Andres Klode ] * apt/package.py: - Decode using utf-8 in installed_files (LP: #407953). + - Fix fetch_source() to work when source name = binary name (LP: #552400). * python/generic.cc: - Fix a memory leak when using old attribute names. - Map ArchiveURI property to archive_uri -- cgit v1.2.3