X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_accepted.py;h=d7db1172f91be48c002c8200f9cc4ca2cb8165ef;hb=52b14d883272923a4296ac02921ccf350815db83;hp=9a56fa2e21f50e402419fbbd5b54d45c98d0f8b9;hpb=934b2b1d73a2333c80a205f206c1b5edd2f719fb;p=dak.git

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 9a56fa2e..d7db1172 100755
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -111,7 +111,7 @@ def usage (exit_code=0):
 
 ###############################################################################
 
-def action (u, stable_queue=None, log_urgency=True):
+def action (u, stable_queue=None, log_urgency=True, session=None):
     (summary, short_summary) = u.build_summaries()
     pi = u.package_info()
 
@@ -318,12 +318,12 @@ def add_deb_to_db(u, filename, session):
 
     session.flush()
 
-    # Deal with contents
-    contents = copy_temporary_contents(bin.package, bin.version, bin.architecture.arch_string, fullpath, None, session)
-    if not contents:
-        print "REJECT\nCould not determine contents of package %s" % bin.package
-        session.rollback()
-        raise MissingContents, "No contents stored for package %s, and couldn't determine contents of %s" % (bin.package, filename)
+    # Deal with contents - disabled for now
+    #contents = copy_temporary_contents(bin.package, bin.version, bin.architecture.arch_string, os.path.basename(filename), None, session)
+    #if not contents:
+    #    print "REJECT\nCould not determine contents of package %s" % bin.package
+    #    session.rollback()
+    #    raise MissingContents, "No contents stored for package %s, and couldn't determine contents of %s" % (bin.package, filename)
 
 
 def install(u, session, log_urgency=True):
@@ -390,7 +390,7 @@ def install(u, session, log_urgency=True):
     # Copy the .changes file across for suite which need it.
     copy_changes = {}
     copy_dot_dak = {}
-    for suite_name in changes["distribution"].keys():
+    for suite_name in u.pkg.changes["distribution"].keys():
         if cnf.has_key("Suite::%s::CopyChanges" % (suite_name)):
             copy_changes[cnf["Suite::%s::CopyChanges" % (suite_name)]] = ""
         # and the .dak file...
@@ -622,8 +622,8 @@ def process_it(changes_file, stable_queue, log_urgency, session):
     if stable_queue:
         u.pkg.changes_file = old
 
-    u.accepted_checks(overwrite_checks, True, session)
-    action(u, stable_queue, log_urgency)
+    u.accepted_checks(overwrite_checks, session)
+    action(u, stable_queue, log_urgency, session)
 
     # Restore CWD
     os.chdir(u.prevdir)