Revert "Merge commit 'stew/content_generation' into merge"

[dak.git] / dak / process_accepted.py

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index cc3f7eabdfe170ef1f4f7b19085144ac6d8ae2ed..71c0312afc450abd881d1f065764b05eed129cb8 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -29,13 +29,8 @@
 
 ###############################################################################
 
-import errno
-import fcntl
-import os
-import sys
-import time
-import re
-import apt_pkg, commands
+import errno, fcntl, os, sys, time, re
+import apt_pkg
 from daklib import database
 from daklib import logging
 from daklib import queue
@@ -102,10 +97,8 @@ class Urgency_Log:
         else:
             os.unlink(self.log_filename)
 
-
 ###############################################################################
 
-
 def reject (str, prefix="Rejected: "):
     global reject_message
     if str:
@@ -169,9 +162,11 @@ def init():
                  ('h',"help","Dinstall::Options::Help"),
                  ('n',"no-action","Dinstall::Options::No-Action"),
                  ('p',"no-lock", "Dinstall::Options::No-Lock"),
-                 ('s',"no-mail", "Dinstall::Options::No-Mail")]
+                 ('s',"no-mail", "Dinstall::Options::No-Mail"),
+                 ('d',"directory", "Dinstall::Options::Directory", "HasArg")]
 
-    for i in ["automatic", "help", "no-action", "no-lock", "no-mail", "version"]:
+    for i in ["automatic", "help", "no-action", "no-lock", "no-mail",
+              "version", "directory"]:
         if not Cnf.has_key("Dinstall::Options::%s" % (i)):
             Cnf["Dinstall::Options::%s" % (i)] = ""
 
@@ -181,6 +176,15 @@ def init():
     if Options["Help"]:
         usage()
 
+    # If we have a directory flag, use it to find our files
+    if Cnf["Dinstall::Options::Directory"] != "":
+        # Note that we clobber the list of files we were given in this case
+        # so warn if the user has done both
+        if len(changes_files) > 0:
+            utils.warn("Directory provided so ignoring files given on command line")
+
+        changes_files = utils.get_changes_files(Cnf["Dinstall::Options::Directory"])
+
     Upload = queue.Upload(Cnf)
     projectB = Upload.projectB
 
@@ -379,8 +383,8 @@ def install ():
                 suite_id = database.get_suite_id(suite)
                 projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%d, currval('binaries_id_seq'))" % (suite_id))
 
-            if not database.copy_temporary_contents(package, version, files[newfile]):
-                reject("Missing contents for package")
+    orig_tar_id = Upload.pkg.orig_tar_id
+    orig_tar_location = Upload.pkg.orig_tar_location
 
     # If this is a sourceful diff only upload that is moving
     # cross-component we need to copy the .orig.tar.gz into the new
@@ -422,6 +426,7 @@ def install ():
         utils.copy(pkg.changes_file, Cnf["Dir::Root"] + dest)
     for dest in copy_dot_dak.keys():
         utils.copy(Upload.pkg.changes_file[:-8]+".dak", dest)
+
     projectB.query("COMMIT WORK")
 
     # Move the .changes into the 'done' directory