merged from http://bzr.debian.org/apt/python-apt/debian-sid/

1 files changed, 7 insertions, 7 deletions

diff --git a/apt/package.py b/apt/package.py
index 701872a8..342fb5cf 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:
@@ -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: