Merge branch 'master' into content_generation

[dak.git] / daklib / binary.py

diff --git a/daklib/binary.py b/daklib/binary.py
index fe7bec8abba37e391861171c78f913550877f1b9..1f630a395de72c607a53cfb9bfe153f1ab41e3b4 100755 (executable)
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -72,10 +72,9 @@ class Binary(object):
         if we were given a reject function, send the reject message,
         otherwise send it to stderr.
         """
+        print >> sys.stderr, message
         if self.wrapped_reject:
             self.wrapped_reject(message)
-        else:
-            print >> sys.stderr, message
 
     def __del__(self):
         """
@@ -138,7 +137,7 @@ class Binary(object):
         """
         self.__scan_ar()
         rejected = not self.chunks
-        if len(self.chunks) != 3:
+        if len(self.chunks) < 3:
             rejected = True
             self.reject("%s: found %d chunks, expected 3." % (self.filename, len(self.chunks)))
         if self.chunks[0] != "debian-binary":
@@ -168,11 +167,11 @@ class Binary(object):
 
         @return True if the deb is valid and contents were imported
         """
+        result = False
         rejected = not self.valid_deb()
         if not rejected:
             self.__unpack()
 
-            result = False
 
             cwd = os.getcwd()
             if not rejected and self.tmpdir: