X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=04823061814912e5da33d084acaeb5cc1ecdf45f;hb=cd33ae05e818e0b6161ef4c1a9eb368cae6db5f4;hp=b1093eea38bd1e1cb702701c8f71b52950efc549;hpb=fa2816b89d52f2af7b99c2e80dd1655d35df0822;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index b1093eea..04823061 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -512,18 +512,18 @@ class DBBinary(ORMObject): iso8859-1 encoding. ''' fullpath = self.poolfile.fullpath - debdata = Popen(['dpkg-deb', '--fsys-tarfile', fullpath], - stdout = PIPE).stdout - tar = TarFile.open(fileobj = debdata, mode = 'r|') + dpkg = Popen(['dpkg-deb', '--fsys-tarfile', fullpath], stdout = PIPE) + tar = TarFile.open(fileobj = dpkg.stdout, mode = 'r|') for member in tar.getmembers(): if member.isfile(): try: name = member.name.decode('utf-8') - catch UnicodeDecodeError: + except UnicodeDecodeError: name = member.name.decode('iso8859-1') yield normpath(name) tar.close() - debdata.close() + dpkg.stdout.close() + dpkg.wait() __all__.append('DBBinary')