From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Jan 2008 13:13:31 +0000 (+0100)
Subject: merge from alioth
X-Git-Tag: userdir-ldap-0.3.16~18
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7a14013dff13a4dd7689f8c35c4f0d1c4f17ef19;hp=1869ceb94928a76f23188d0b9939327c3a8dd7b9;p=mirror%2Fuserdir-ldap.git

merge from alioth
---

diff --git a/debian/changelog b/debian/changelog
index ee25ccc..f55b375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,10 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
   * ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:
     Update ud-userimport to use the same objectClasses as
     ud-{user,group,role}add and abstract them out into userdir_ldap.py
+  * ud-useradd: Avoid a TypeError exception when constructing the template
+    filename
 
- -- Mark Hymers <mhy@debian.org>  Wed, 26 Dec 2007 17:56:28 +0000
+ -- Mark Hymers <mhy@debian.org>  Wed, 26 Dec 2007 18:00:08 +0000
 
 userdir-ldap (0.3.15) unstable; urgency=low
 
diff --git a/ud-useradd b/ud-useradd
index e0c30e9..8cc425b 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -306,7 +306,7 @@ if Update == 1 and ForceMail == 0:
 
 # Send the Welcome message
 print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir+"/welcome-message-"+gidNumber,"r").read());
+Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % gidNumber, "r").read())
 Child = os.popen("/usr/sbin/sendmail -t","w");
 #Child = os.popen("cat","w");
 Child.write(Reply);