From e5bf0fa733eb5ffe02f4cf86a40ba9c29a81e178 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 4 Jul 2014 15:36:04 +0200
Subject: [PATCH] fixes #526522 ldaptor-ldap2passwd --help throws exception.
 Author: Jan Dittberner <jandd@debian.org>

---
 .gitignore              | 3 ++-
 bin/ldaptor-ldap2passwd | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd48532a..2687fbe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
 /doc/*.dia.png
 /ldaptor/test/ldif/webtests.tmp
 ldaptor.test.test_config
-ldaptor.egg-info/
+ldaptor.egg-info
+.idea
diff --git a/bin/ldaptor-ldap2passwd b/bin/ldaptor-ldap2passwd
index 8ad0aaf5..66e0a6d0 100755
--- a/bin/ldaptor-ldap2passwd
+++ b/bin/ldaptor-ldap2passwd
@@ -77,7 +77,7 @@ if __name__ == "__main__":
     try:
         opts = MyOptions()
         opts.parseOptions()
-    except usage.UsageError, ue:
+    except usage.usage.UsageError, ue:
         sys.stderr.write('%s: %s\n' % (sys.argv[0], ue))
         sys.exit(1)