[Python-modules-commits] r8748 - in packages/ldaptor/trunk/debian (3 files)

[jandd-guest at users.alioth.debian.org]

    Date: Monday, June 8, 2009 @ 20:30:55
  Author: jandd-guest
Revision: 8748

add fix for #526522

Added:
  packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch
Modified:
  packages/ldaptor/trunk/debian/changelog
  packages/ldaptor/trunk/debian/patches/00list

Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog	2009-06-08 10:38:05 UTC (rev 8747)
+++ packages/ldaptor/trunk/debian/changelog	2009-06-08 20:30:55 UTC (rev 8748)
@@ -1,3 +1,9 @@
+ldaptor (0.0.43-4) UNRELEASED; urgency=low
+
+  * add debian/patches/02_fix_526522.dpatch (Closes: #526522)
+
+ -- Jan Dittberner <jan at dittberner.info>  Mon, 08 Jun 2009 22:26:16 +0200
+
 ldaptor (0.0.43-3) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/ldaptor/trunk/debian/patches/00list
===================================================================
--- packages/ldaptor/trunk/debian/patches/00list	2009-06-08 10:38:05 UTC (rev 8747)
+++ packages/ldaptor/trunk/debian/patches/00list	2009-06-08 20:30:55 UTC (rev 8748)
@@ -1 +1,2 @@
 01_restore_pristine_code
+02_fix_526522

Added: packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch
===================================================================
--- packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch	                        (rev 0)
+++ packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch	2009-06-08 20:30:55 UTC (rev 8748)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_526522.dpatch by Jan Dittberner <jan at dittberner.info>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes #526522 ldaptor-ldap2passwd --help throws exception.
+
+ at DPATCH@
+diff -urNad ldaptor-0.0.43~/bin/ldaptor-ldap2passwd ldaptor-0.0.43/bin/ldaptor-ldap2passwd
+--- ldaptor-0.0.43~/bin/ldaptor-ldap2passwd	2005-12-04 11:09:40.000000000 +0100
++++ ldaptor-0.0.43/bin/ldaptor-ldap2passwd	2009-06-08 22:18:48.000000000 +0200
+@@ -77,7 +77,7 @@
+     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)
+