Fix utils.build_file_list() for 3.x source packages

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index 81b54c9cc8f978f66432be4a329e3fe8d43f4374..aca1b8a07f702d9f2756cf70c455031860180fbd 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -690,11 +690,12 @@ class Upload(object):
         # Check the version and for file overwrites
         self.check_binary_against_db(f, session)
 
-        b = Binary(f)
-        b.scan_package()
-        if len(b.rejects) > 0:
-            for j in b.rejects:
-                self.rejects.append(j)
+        # Temporarily disable contents generation until we change the table storage layout
+        #b = Binary(f)
+        #b.scan_package()
+        #if len(b.rejects) > 0:
+        #    for j in b.rejects:
+        #        self.rejects.append(j)
 
     def source_file_checks(self, f, session):
         entry = self.pkg.files[f]
@@ -1320,7 +1321,7 @@ class Upload(object):
                         sourcepkg, trans)
 
                     if current is not None:
-                        currentlymsg = "at version %s" % (current)
+                        currentlymsg = "at version %s" % (current.version)
                     else:
                         currentlymsg = "not present in testing"
 
@@ -1333,7 +1334,7 @@ Release Team, and %s is the Release-Team member responsible for it.
 Please mail debian-release@lists.debian.org or contact %s directly if you
 need further assistance.  You might want to upload to experimental until this
 transition is done."""
-                            % (source.source, currentlymsg, expected,t["rm"], t["rm"])))
+                            % (source, currentlymsg, expected,t["rm"], t["rm"])))
 
                     self.rejects.append(rejectmsg)
                     return