allow p-a and p-u to take a directory to parse themselves

[dak.git] / dak / process_unchecked.py

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 288563af9a85df0b65aa83ccd75df5a92bc9dd57..e04572604648a4bb226e00d2bee70c3f122d38af 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -78,10 +78,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")]
 
     for i in ["automatic", "help", "no-action", "no-lock", "no-mail",
-              "override-distribution", "version"]:
+              "override-distribution", "version", "directory"]:
         Cnf["Dinstall::Options::%s" % (i)] = ""
 
     changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
@@ -90,6 +91,21 @@ 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")
+
+        dir = Cnf["Dinstall::Options::Directory"]
+        try:
+            # Much of the rest of p-u depends on being in the right place
+            os.chdir(dir)
+            changes_files = [x for x in os.listdir(dir) if x.endswith('.changes')]
+        except OSError, e:
+            utils.fubar("Failed to read list from directory %s (%s)" % (dir, e))
+
     Upload = queue.Upload(Cnf)
 
     changes = Upload.pkg.changes