Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap

* 'master' of ssh://db.debian.org/git/userdir-ldap:
  Add debian-maintainers.gpg to keyrings and sync_keyrings.
  cast objects to strings (rt #1717)

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index bd7673c..abffeea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 userdir-ldap (0.3.72XX) Xnstable; urgency=low
 
   * ud-useradd: Allow unsetting of middle names by entering a space.
+  * userdir-ldap.conf: Add debian-maintainers.gpg to keyrings and
+    sync_keyrings.
   * ud-useradd: force gidNumber to be an int when we open the welcome
     template (it can be different when we read it from input using -n).
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 09 Sep 2009 19:19:55 +0200
+ -- Peter Palfrader <weasel@debian.org>  Wed, 09 Sep 2009 19:21:12 +0200
 
 userdir-ldap (0.3.71) unstable; urgency=low
 

diff --git a/ud-useradd b/ud-useradd
index 627cc14..c183dca 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -241,14 +241,14 @@ encto = ''
 try:
   encto = FullName.decode('us-ascii')
 except UnicodeError:
-  encto = email.Header.Header(FullName, 'utf-8', 200) + " " + emailaddr
+  encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
 
 subjstring = "New Debian Maintainer " + FullName
 encsubj = ''
 try:
   encsubj = subjstring.decode('us-ascii')
 except UnicodeError:
-  encsubj = email.Header.Header(subjstring, 'utf-8', 200)
+  encsubj = str(email.Header.Header(subjstring, 'utf-8', 200))
 
 Subst["__HEADER_SUBJ__"] = encsubj
 Subst["__HEADER_EMAIL"] = encto

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index e01b60f..cb4a5cb 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -46,9 +46,9 @@ homeprefix = "/home/";
 # GPG Things
 gpg = "/usr/bin/gpg";
 # The whole set of all keyrings
-keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"
+keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
 # Keyrings synced to other machines, if they need them
-sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
+sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
 # Keyrings used to search in when new developers get added
 add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"