X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_known_changes.py;h=d286775abcb977770b9f15ca99815d2f94017ff4;hb=eeae103589a343674d93a674e77efc2c724fa2a9;hp=5aa9a5805a7f1f4a10a2f8363bcada76b5e0e733;hpb=1ab6105c5cdf9847bd949c14c8c2d6697670ed2c;p=dak.git diff --git a/dak/import_known_changes.py b/dak/import_known_changes.py index 5aa9a580..d286775a 100755 --- a/dak/import_known_changes.py +++ b/dak/import_known_changes.py @@ -195,7 +195,7 @@ class ChangesGenerator(threading.Thread): if os.path.exists(checkdir): print "Looking into %s" % (checkdir) - for dirpath, dirnames, filenames in os.walk(checkdir, topdown=False): + for dirpath, dirnames, filenames in os.walk(checkdir, topdown=True): if not filenames: # Empty directory (or only subdirectories), next continue @@ -255,15 +255,12 @@ class ImportThread(threading.Thread): except ChangesUnicodeError: warn("found invalid changes file, not properly utf-8 encoded") - except KeyboardInterrupt: print("Caught C-c; on ImportThread. terminating.") self.parent.plsDie() sys.exit(1) - print("STUSTUSTUSTUSTU") - return + except: - traceback.print_exc() self.parent.plsDie() sys.exit(1) @@ -293,7 +290,7 @@ class ImportKnownChanges(object): self.threads=[] sys.exit(1) - + def main(): cnf = Config() @@ -332,7 +329,7 @@ def main(): ImportKnownChanges(num_threads) - + if __name__ == '__main__': main()