byhand-di: allow YYYYMMDD+<suite>x version numbers

[dak.git] / daklib / binary.py

diff --git a/daklib/binary.py b/daklib/binary.py
old mode 100755 (executable)
new mode 100644 (file)
index 8a0cf09..d1f78f3
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -47,7 +47,12 @@ import commands
 import traceback
 import atexit
 
-from debian_bundle import deb822
+try:
+    # starting with squeeze
+    from debian import deb822
+except:
+    # up to lenny
+    from debian_bundle import deb822
 
 from dbconn import *
 from config import Config
@@ -251,12 +256,16 @@ class Binary(object):
                     except:
                         print >> sys.stderr, "E: %s has non-unicode filename: %s" % (package,tarinfo.name)
 
+                result = True
+
             except:
                 traceback.print_exc()
                 result = False
 
             os.chdir(cwd)
 
+        return result
+
 __all__.append('Binary')
 
 
@@ -320,13 +329,13 @@ def copy_temporary_contents(binary, bin_association, reject, session=None):
         table = "deb_contents"
     else:
         return False
-    
+
 
     if component.name == "main":
         component_str = ""
     else:
         component_str = component.name + "/"
-        
+
     vals = { 'package':binary.package,
              'version':binary.version,
              'arch':binary.architecture,