From: Joerg Jaspert Date: Wed, 24 Sep 2008 21:22:16 +0000 (+0200) Subject: Merge commit 'sec-merge' into security X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b07852aa10727e959844a3f3b4d5b8a6bce00dbf;hp=a41f36505ff2297d3455c8b6ca846d0f2ffce5de;p=dak.git Merge commit 'sec-merge' into security * commit 'sec-merge': (29 commits) Cleanup Cleanup Cleanup in check_archives pychecker cleanup "Fake" a changelog entry for Mark Do not allow o-p-u-new to break dinstall WTF? rm -f ? WTF? Revert examine_package.py, which was broken clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings clean up pychecker warnings fix the simpler of the pychecker errors ... Signed-off-by: Joerg Jaspert --- diff --git a/ChangeLog b/ChangeLog index b5c129b0..e515fc65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,11 @@ long-time unused and commented code. Import stuff from daklib as "import daklib.foo as foo" +2008-05-04 Thomas Viehmann + + * dak/process_unchecked.py (check_signed_by_key): cater for uid_email + None in sponsor notification + 2008-05-03 Joerg Jaspert * dak/examine_package.py: clean up pychecker warnings (merged with @@ -34,6 +39,7 @@ * dak/stats.py: likewise * dak/symlink_dists.py: likewise * dak/transitions.py: likewise +>>>>>>> sec-merge:ChangeLog 2008-05-03 Joerg Jaspert diff --git a/dak/dak.py b/dak/dak.py old mode 100644 new mode 100755 diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index b1845617..db1fee86 100644 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -1090,7 +1090,7 @@ def check_signed_by_key(): else: sponsored = 1 if ("source" in changes["architecture"] and - daklib.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"]) if (changes["maintaineremail"] not in sponsor_addresses and changes["changedbyemail"] not in sponsor_addresses): diff --git a/templates/security-install.advisory b/templates/security-install.advisory index baebe916..13220f36 100644 --- a/templates/security-install.advisory +++ b/templates/security-install.advisory @@ -30,16 +30,15 @@ Foo discovered that For the stable distribution (etch), this problem has been fixed in version XXX __PACKAGE__ -For the old stable distribution (sarge), this problem has been fixed in -version __PACKAGE__ +For the unstable distribution (sid), this problem has been fixed in +version XXX [multiple issues] For the stable distribution (etch), these problems have been fixed in version __PACKAGE__ -For the old stable distribution (sarge), these problems have been fixed in -version __PACKAGE__ - +For the unstable distribution (sid), these problems have been fixed in +version XXX We recommend that you upgrade your __PACKAGE__ package. @@ -63,13 +62,9 @@ You may use an automated update by adding the resources from the footer to the proper configuration. -Debian GNU/Linux 3.1 alias sarge --------------------------------- - Debian GNU/Linux 4.0 alias etch ------------------------------- - __ADVISORY_TEXT__