From: Torsten Werner <twerner@debian.org>
Date: Mon, 7 Mar 2011 20:46:00 +0000 (+0100)
Subject: Include all files (except directories) in bin_contents table.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e3544ea0e2e9078fd849fb6f264c8b36b119a37a;p=dak.git

Include all files (except directories) in bin_contents table.

Signed-off-by: Torsten Werner <twerner@debian.org>
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 6827891d..9b757d13 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -515,9 +515,8 @@ class DBBinary(ORMObject):
         fullpath = self.poolfile.fullpath
         dpkg = Popen(['dpkg-deb', '--fsys-tarfile', fullpath], stdout = PIPE)
         tar = TarFile.open(fileobj = dpkg.stdout, mode = 'r|')
-        anything_yielded = False
         for member in tar.getmembers():
-            if member.isfile():
+            if not member.isdir():
                 name = normpath(member.name)
                 # enforce proper utf-8 encoding
                 try:
@@ -525,9 +524,6 @@ class DBBinary(ORMObject):
                 except UnicodeDecodeError:
                     name = name.decode('iso8859-1').encode('utf-8')
                 yield name
-                anything_yielded = True
-        if not anything_yielded:
-            yield ' <EMPTY PACKAGE>'
         tar.close()
         dpkg.stdout.close()
         dpkg.wait()