Merge branch 'master' into dbtests

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index 7bfac44eb4487c8a4b8fbbb01189fc29406482fc..646d89c508a349193ee9ab2033af30f56098249a 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -53,7 +53,6 @@ from dbconn import *
 from summarystats import SummaryStats
 from utils import parse_changes, check_dsc_files
 from textutils import fix_maintainer
-from binary import Binary
 from lintian import parse_lintian_output, generate_reject_messages
 
 # suppress some deprecation warnings in squeeze related to apt_pkg
@@ -866,13 +865,6 @@ class Upload(object):
         # Check the version and for file overwrites
         self.check_binary_against_db(f, session)
 
-        # 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]