From: Torsten Werner <twerner@debian.org>
Date: Fri, 4 Mar 2011 21:28:57 +0000 (+0100)
Subject: Save a dummy filename for packages without files.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd59ae4dadd3432690a8a3f9c3902c5eddd6e1ae;p=dak

Save a dummy filename for packages without files.

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

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 87db1a35..6827891d 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -508,12 +508,14 @@ class DBBinary(ORMObject):
     def scan_contents(self):
         '''
         Yields the contents of the package. Only regular files are yielded and
-        the path names are normalized after converting them from either utf-8 or
-        iso8859-1 encoding.
+        the path names are normalized after converting them from either utf-8
+        or iso8859-1 encoding. It yields the string ' <EMPTY PACKAGE>' if the
+        package does not contain any regular file.
         '''
         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():
                 name = normpath(member.name)
@@ -523,6 +525,9 @@ 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()