[Da-tools-commits] ./da-tools/userdir-ldap-sshkeys r359: merge upstream

[Mark Hymers]

------------------------------------------------------------
revno: 359
committer: Mark Hymers <mark at hymers.org.uk>
branch nick: userdir-ldap-common-sshkeys
timestamp: Wed 2007-12-26 20:56:05 +0000
message:
  merge upstream
modified:
  debian/changelog
  ud-arbimport
    ------------------------------------------------------------
    revno: 353.1.6
    committer: Mark Hymers <mark at hymers.org.uk>
    branch nick: userdir-ldap-common
    timestamp: Wed 2007-12-26 20:55:32 +0000
    message:
      * ud-arbimport: os.exit -> sys.exit
    modified:
      debian/changelog
      ud-arbimport
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-12-26 20:49:42 +0000
+++ b/debian/changelog	2007-12-26 20:55:32 +0000
@@ -19,8 +19,9 @@
   * 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 at debian.org>  Wed, 26 Dec 2007 20:49:18 +0000
+ -- Mark Hymers <mhy at debian.org>  Wed, 26 Dec 2007 20:54:28 +0000
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

=== modified file 'ud-arbimport'
--- a/ud-arbimport	2007-12-26 20:49:42 +0000
+++ b/ud-arbimport	2007-12-26 20:55:32 +0000
@@ -36,7 +36,7 @@
        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)