ftpmaster-dak r1082: Merge from Thomas
------------------------------------------------------------
revno: 1082
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Sun 2008-05-04 11:13:30 +0200
message:
Merge from Thomas
modified:
ChangeLog
dak/process_unchecked.py
------------------------------------------------------------
revno: 1076.1.1
committer: Thomas Viehmann <tv@beamnet.de>
branch nick: fix-uid-can-be-none
timestamp: Sun 2008-05-04 06:55:42 +0000
message:
cater for uid_email None in sponsor notification
modified:
ChangeLog
dak/process_unchecked.py
=== modified file 'ChangeLog'
--- a/ChangeLog 2008-05-04 00:34:14 +0000
+++ b/ChangeLog 2008-05-04 09:13:30 +0000
@@ -40,6 +40,11 @@
long-time unused and commented code. Import stuff from daklib as
"import daklib.foo as foo"
+2008-05-04 Thomas Viehmann <tv@beamnet.de>
+
+ * dak/process_unchecked.py (check_signed_by_key): cater for uid_email
+ None in sponsor notification
+
2008-05-03 Joerg Jaspert <joerg@debian.org>
* dak/examine_package.py: clean up pychecker warnings (merged with
=== modified file 'dak/process_unchecked.py'
--- a/dak/process_unchecked.py 2008-05-04 00:30:44 +0000
+++ b/dak/process_unchecked.py 2008-05-04 09:13:30 +0000
@@ -1090,7 +1090,7 @@
else:
sponsored = 1
if ("source" in changes["architecture"] and
- utils.is_email_alias(uid_email)):
+ uid_email and utils.is_email_alias(uid_email)):
sponsor_addresses = utils.gpg_get_key_addresses(changes["fingerprint"])
if (changes["maintaineremail"] not in sponsor_addresses and
changes["changedbyemail"] not in sponsor_addresses):
Reply to: