X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=f2efe8c0393439dbfe812bd542e30514d240845c;hb=536cb00b606a8581a76b66f55a58eabdf9f7fd3d;hp=34d1739f7665a025f26581a4a24c19a2d838a44e;hpb=774a27caff1cc21340ee1b08528512e96a0eed5b;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 34d1739f..f2efe8c0 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -700,6 +700,9 @@ def check_dsc(): except NoFilesFieldError: reject("%s: no Files: field." % (dsc_filename)) return 0 + except UnknownFormatError, format: + reject("%s: unknown format '%s'." % (dsc_filename, format)) + return 0 except ParseChangesError, line: reject("%s: parse error, can't grok: %s." % (dsc_filename, line)) return 0 @@ -906,10 +909,10 @@ def check_urgency (): if changes["architecture"].has_key("source"): if not changes.has_key("urgency"): changes["urgency"] = Cnf["Urgency::Default"] + changes["urgency"] = changes["urgency"].lower() if changes["urgency"] not in Cnf.ValueList("Urgency::Valid"): reject("%s is not a valid urgency; it will be treated as %s by testing." % (changes["urgency"], Cnf["Urgency::Default"]), "Warning: ") changes["urgency"] = Cnf["Urgency::Default"] - changes["urgency"] = changes["urgency"].lower() ################################################################################ @@ -948,6 +951,8 @@ def check_hashes (): check_hash(".changes %s" % (h), fs, h, f, files) except NoFilesFieldError: reject("No Checksums-%s: field in .changes" % (h)) + except UnknownFormatError, format: + reject("%s: unknown format of .changes" % (format)) except ParseChangesError, line: reject("parse error for Checksums-%s in .changes, can't grok: %s." % (h, line)) @@ -956,6 +961,8 @@ def check_hashes (): try: fs = utils.build_file_list(dsc, 1, "checksums-%s" % h, h) check_hash(".dsc %s" % (h), fs, h, f, dsc_files) + except UnknownFormatError, format: + reject("%s: unknown format of .dsc" % (format)) except NoFilesFieldError: reject("No Checksums-%s: field in .dsc" % (h)) except ParseChangesError, line: