don't do the same thing twice, do it once, but correctly

[dak.git] / daklib / binary.py

diff --git a/daklib/binary.py b/daklib/binary.py
old mode 100755 (executable)
new mode 100644 (file)
index 0a27f95..c6ee96f
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -248,12 +248,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')
 
 def copy_temporary_contents(package, version, archname, deb, reject, session=None):
@@ -300,7 +304,8 @@ def copy_temporary_contents(package, version, archname, deb, reject, session=Non
         message = utils.TemplateSubst(subst, cnf["Dir::Templates"]+"/missing-contents")
         utils.send_mail(message)
 
-        exists = Binary(deb, reject).scan_package()
+        # Temporarily disable contents storage until we re-do the table layout
+        #exists = Binary(deb, reject).scan_package()
 
     if exists:
         sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)