Fixed and made changes for Joerg.

NOTICE: import_keyring.py has not been smoke tested. In case
        of breakage, run and hide from Joerg.

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>

diff --git a/dak/import_keyring.py b/dak/import_keyring.py
index 25f72e401d1450a17c3cd9834201180ae145b93b..3482a14ba7be85458fbe92453690d0110ce6f7dc 100755 (executable)
--- a/dak/import_keyring.py
+++ b/dak/import_keyring.py
@@ -172,8 +172,8 @@ def usage (exit_code=0):
     print """Usage: dak import-keyring [OPTION]... [KEYRING]
   -h, --help                  show this help and exit.
   -L, --import-ldap-users     generate uid entries for keyring from LDAP
-  -U, --generate-users FMT    generate uid entries from keyring as FMT"""
-  -D, --debian-maintainer     mark generated uids as debian-maintainers
+  -U, --generate-users FMT    generate uid entries from keyring as FMT
+  -D, --debian-maintainer     mark generated uids as debian-maintainers"""
     sys.exit(exit_code)
 
 

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 7d8d4f233d15033d8384080f33bb6221cb491c39..a95de5fce04ff3a3aabc4e2ac667feabaa738799 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1047,13 +1047,12 @@ def check_signed_by_key():
 
         highest_sid, highest_version = None, None
 
-        is_allowed = 1
+        should_reject = True
         for si in q.getresult():
             if highest_version == None or apt_pkg.VersionCompare(si[1], highest_version) == 1:
                  highest_sid = si[0]
                  highest_version = si[1]
 
-        print highest_sid
         if highest_sid == None:
            reject("Source package %s does not have 'DM-Upload-Allowed: yes' in its most recent version" % changes["source"])
         else:
@@ -1061,10 +1060,10 @@ def check_signed_by_key():
             for m in q.getresult():
                 (rfc822, rfc2047, name, email) = utils.fix_maintainer(m[0])
                 if email == uid_email or name == uid_name:
-                    is_allowed=0
+                    should_reject=True
                     break
 
-        if is_allowed:
+        if should_reject == True:
             reject("%s is not in Maintainer or Uploaders of source package %s" % (uid, changes["source"]))
 
         for b in changes["binary"].keys():