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

Merge from alioth
---

diff --git a/debian/changelog b/debian/changelog
index b1917b8..fe0176e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,9 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
   * ud-useradd: Avoid a TypeError exception when constructing the template
     filename
   * Remove use of deprecated functions from the string module 
+  * ud-arbimport: os.exit -> sys.exit
 
- -- Mark Hymers <mhy@debian.org>  Wed, 26 Dec 2007 20:49:18 +0000
+ -- Mark Hymers <mhy@debian.org>  Wed, 26 Dec 2007 20:54:28 +0000
 
 userdir-ldap (0.3.15) unstable; urgency=low
 
diff --git a/ud-arbimport b/ud-arbimport
index 5d5a37d..7d306f7 100755
--- a/ud-arbimport
+++ b/ud-arbimport
@@ -36,7 +36,7 @@ for (switch, val) in options:
        NoAct = 1;
 if len(arguments) == 0:
    print "Give the key to assignt to then the file to import";
-   os.exit(0);
+   sys.exit(0)
 
 # Main program starts here
 l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)