X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=8392e7f5e4b31ac5df7996f7fc4bb30e0973039b;hb=ec73fa2dc5acdc3062336d90685a17dfc4b21213;hp=e04572604648a4bb226e00d2bee70c3f122d38af;hpb=7977dd3c83fd5f1c03ec1e5d79df90ca2663354c;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index e0457260..8392e7f5 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -79,7 +79,7 @@ def init(): ('n',"no-action","Dinstall::Options::No-Action"), ('p',"no-lock", "Dinstall::Options::No-Lock"), ('s',"no-mail", "Dinstall::Options::No-Mail"), - ('d',"directory", "Dinstall::Options::Directory")] + ('d',"directory", "Dinstall::Options::Directory", "HasArg")] for i in ["automatic", "help", "no-action", "no-lock", "no-mail", "override-distribution", "version", "directory"]: @@ -98,13 +98,7 @@ def init(): 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)) + changes_files = utils.get_changes_files(Cnf["Dinstall::Options::Directory"]) Upload = queue.Upload(Cnf)