X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fextensions.py;h=0bb51bd7e8d6281f776a578efb0a95c1fd3b4796;hb=0fbf46fb7da5309d9fca4761178c1375cb8916ee;hp=e17e9af88b518983af39012202da5f830de88f7d;hpb=1e8dd7a1e4aa362cb5275a4db27251a77e5a9c34;p=dak.git diff --git a/config/debian/extensions.py b/config/debian/extensions.py index e17e9af8..0bb51bd7 100644 --- a/config/debian/extensions.py +++ b/config/debian/extensions.py @@ -20,12 +20,12 @@ def check_transition(): if "source" not in changes["architecture"] or "unstable" not in changes["distribution"]: return - # Also only check if there is a file defined (and existant) with + # Also only check if there is a file defined (and existant) with # checks. transpath = Cnf.get("Dinstall::Reject::ReleaseTransitions", "") if transpath == "" or not os.path.exists(transpath): return - + # Parse the yaml file sourcefile = file(transpath, 'r') sourcecontent = sourcefile.read() @@ -86,14 +86,14 @@ def check_signed_by_key(oldfn): if changes["source"] == "dpkg": fpr = changes["fingerprint"] - (uid, uid_name) = dak_module.lookup_uid_from_fingerprint(fpr) + (uid, uid_name, is_dm) = dak_module.lookup_uid_from_fingerprint(fpr) if fpr == "5906F687BD03ACAD0D8E602EFCF37657" or uid == "iwj": reject("Upload blocked due to hijack attempt 2008/03/19") - # NB: 1.15.0, 1.15.2 signed by this key targetted at unstable - # have been made available in the wild, and should remain - # blocked until Debian's dpkg has revved past those version - # numbers + # NB: 1.15.0, 1.15.2 signed by this key targetted at unstable + # have been made available in the wild, and should remain + # blocked until Debian's dpkg has revved past those version + # numbers oldfn()