[Da-tools-commits] ./da-tools/userdir-ldap-common r364: merge from alioth

[Peter Palfrader]

------------------------------------------------------------
revno: 364
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 14:13:31 +0100
message:
  merge from alioth
modified:
  debian/changelog
  ud-useradd
    ------------------------------------------------------------
    revno: 349.2.8
    committer: Mark Hymers <mark at hymers.org.uk>
    branch nick: userdir-ldap-common
    timestamp: Wed 2007-12-26 18:01:19 +0000
    message:
      * ud-useradd: Avoid a TypeError exception when constructing the template
        filename
    modified:
      debian/changelog
      ud-useradd
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-01-10 13:10:58 +0000
+++ b/debian/changelog	2008-01-10 13:13:31 +0000
@@ -26,8 +26,10 @@
   * 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 at debian.org>  Wed, 26 Dec 2007 17:56:28 +0000
+ -- Mark Hymers <mhy at debian.org>  Wed, 26 Dec 2007 18:00:08 +0000
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

=== modified file 'ud-useradd'
--- a/ud-useradd	2007-12-26 17:57:58 +0000
+++ b/ud-useradd	2007-12-26 18:01:19 +0000
@@ -306,7 +306,7 @@
 
 # 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);