Split error messages.

Changed files:
    PLD_Builder/request_handler.py -> 1.47

diff --git a/PLD_Builder/request_handler.py b/PLD_Builder/request_handler.py
index 78cbc211f9a9394032d5402ecdfb00c32adb58f1..defdcc7db90c20a307a76d09b32b21a585174695 100644 (file)
--- a/PLD_Builder/request_handler.py
+++ b/PLD_Builder/request_handler.py
@@ -161,12 +161,15 @@ def handle_request(req, filename = None):
         log.alert('Empty body received. Filename: %s' % filename)
         return False
 
+    keys = gpg.get_keys(req)
     (em, body) = gpg.verify_sig(req)
+    if not em:
+        log.alert("Invalid signature, missing/untrusted key. Keys in gpg batch: '%s'" % keys
+        return False
     user = acl.user_by_email(em)
     if user == None:
         # FIXME: security email here
-        keys = gpg.get_keys(req)
-        log.alert("Invalid signature, missing/untrusted key, or '%s' not in acl. Keys in gpg batch: '%s'" % (em, keys))
+        log.alert("'%s' not in acl. Keys in gpg batch: '%s'" % (em, keys))
         return False
 
     acl.set_current_user(user)