From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 4 May 2008 09:13:30 +0000 (+0200)
Subject: Merge from Thomas
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3a48d9bed2ff0984eee329153f4e158919a597ec;p=dak.git

Merge from Thomas
---

3a48d9bed2ff0984eee329153f4e158919a597ec
diff --cc ChangeLog
index ab1a70a6,6f67b2e2..eead3da3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,71 -1,8 +1,76 @@@
 +2008-05-04  Joerg Jaspert  <joerg@debian.org>
 +
 +	* dak/import_keyring.py: Remove unused daklib.logging and Logger
 +	and add the actually used daklib/utils
 +
 +	* dak/examine_package.py: remove daklib.queue import, never used
 +
 +	* dak/check_proposed_updates.py: Import stuff from daklib as
 +	"import daklib.foo as foo"
 +	* dak/clean_proposed_updates.py: likewise
 +	* dak/clean_queues.py: likewise
 +	* dak/clean_suites.py: likewise
 +	* dak/compare_suites.py: likewise
 +	* dak/cruft_report.py: likewise
 +	* dak/examine_package.py: likewise
 +	* dak/find_null_maintainers.py: likewise
 +	* dak/generate_index_diffs.py: likewise
 +	* dak/generate_releases.py: likewise
 +	* dak/import_archive.py: likewise
 +	* dak/import_ldap_fingerprints.py: likewise
 +	* dak/import_users_from_passwd.py: likewise
 +	* dak/init_db.py: likewise
 +	* dak/init_dirs.py: likewise
 +	* dak/ls.py: likewise
 +	* dak/make_maintainers.py: likewise
 +	* dak/make_overrides.py: likewise
 +	* dak/make_suite_file_list.py: likewise
 +	* dak/new_security_install.py: likewise
 +	* dak/override.py: likewise
 +	* dak/process_accepted.py: likewise
 +	* dak/process_new.py: likewise
 +	* dak/process_unchecked.py: likewise
 +	* dak/rm.py: likewise
 +	* dak/show_new.py: likewise
 +	* dak/split_done.py: likewise
 +	* dak/stats.py: likewise
 +	* dak/transitions.py: likewise
 +
 +	* dak/check_archive.py (check_files_not_symlinks): Remove
 +	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
 +	Thomas changes to the NEW display)
 +
 +2008-05-03  Mark Hymers <mhy@debian.org>
 +
 +	* dak/check_archive.py: clean up pychecker warnings
 +	* dak/check_overrides.py: likewise
 +	* dak/check_proposed_updates.py: likewise
 +	* dak/clean_proposed_updates.py: likewise
 +	* dak/clean_queues.py: likewise
 +	* dak/control_overrides.py: likewise
 +	* dak/control_suite.py: likewise
 +	* dak/decode_dot_dak.py: likewise
 +	* dak/examine_package.py: likewise
 +	* dak/process_new.py: likewise
 +	* dak/process_unchecked.py: likewise
 +	* dak/queue_report.py: likewise
 +	* dak/reject_proposed_updates.py: likewise
 +	* dak/security_install.py: likewise
 +	* dak/show_new.py: likewise
 +	* dak/stats.py: likewise
 +	* dak/symlink_dists.py: likewise
 +	* dak/transitions.py: likewise
 +
  2008-05-03  Joerg Jaspert  <joerg@debian.org>
  
  	* config/debian/cron.daily: Rename to
diff --cc dak/process_unchecked.py
index 15aea62e,6a6c52d6..fbd7d74d
mode 100755,100644..100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@@ -1090,8 -1090,8 +1090,8 @@@ def check_signed_by_key()
      else:
          sponsored = 1
          if ("source" in changes["architecture"] and
-             utils.is_email_alias(uid_email)):
 -            uid_email and daklib.utils.is_email_alias(uid_email)):
 -            sponsor_addresses = daklib.utils.gpg_get_key_addresses(changes["fingerprint"])
++            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):
                  changes["sponsoremail"] = uid_email