Merge commit 'sec-merge' into security

* commit 'sec-merge':
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Tell bzr that dak.py should be executable
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Cleanup

diff --git a/ChangeLog b/ChangeLog
index d939879be2e1c0f3c4158646cfba128b6caad6b9..833a64bf860063d048d7f993c9938dbf58e8c3cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,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
@@ -44,6 +49,7 @@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>
 

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index b1845617fa4f15fa53ba6fb6a04c1ebb730a7663..db1fee8643af865ce827ce2d7278252e33c184b8 100644 (file)
--- 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 baebe9166661b1c2de77c043cece2f7b62e3f504..13220f362de0dc8f3dc52f21883b0a523f71fb07 100644 (file)
--- 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__