From: Torsten Werner <twerner@debian.org>
Date: Tue, 15 Mar 2011 18:14:47 +0000 (+0100)
Subject: Merge branch 'dbtests'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d87d13020d406771da394989f22ba15e20e80461;hp=904ac9b520fb3a9449a42f7f26e71c372789227d;p=dak.git

Merge branch 'dbtests'
---

diff --git a/daklib/contents.py b/daklib/contents.py
index bbbacd4a..27ffdda6 100755
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -257,18 +257,12 @@ class ContentsScanner(object):
         '''
         session = DBConn().session()
         binary = session.query(DBBinary).get(self.binary_id)
-        empty_package = True
-        for filename in binary.scan_contents():
+        fileset = set(binary.scan_contents())
+        if len(fileset) == 0:
+            fileset.add('EMPTY_PACKAGE')
+        for filename in fileset:
             binary.contents.append(BinContents(file = filename))
-            empty_package = False
-        if empty_package:
-            binary.contents.append(BinContents(file = 'EMPTY_PACKAGE'))
-        try:
-            session.commit()
-        except IntegrityError:
-            session.rollback()
-            binary.contents.append(BinContents(file = 'DUPLICATE_FILENAMES'))
-            session.commit()
+        session.commit()
         session.close()
 
     @classmethod