[SCM] mediagoblin/master: Add patch 1001 to fix syntax for listing multiple exceptions.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Aug 21 09:14:51 UTC 2017


The following commit has been merged in the master branch:
commit 165bda3562aaa86871d47917484a820f2ec8090c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Aug 21 10:53:33 2017 +0200

    Add patch 1001 to fix syntax for listing multiple exceptions.

diff --git a/debian/patches/1001_fix_exception_syntax.patch b/debian/patches/1001_fix_exception_syntax.patch
new file mode 100644
index 0000000..6a64317
--- /dev/null
+++ b/debian/patches/1001_fix_exception_syntax.patch
@@ -0,0 +1,16 @@
+Description: Fix syntax for listing multiple exceptions
+Author: Jonas Smedegaard <dr at jones.dk>
+Last-Update: 2017-08-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/mediagoblin/plugins/ldap/tools.py
++++ b/mediagoblin/plugins/ldap/tools.py
+@@ -57,7 +57,7 @@
+                 email = self._get_email(v, username)
+                 return username, email
+ 
+-            except ldap.LDAPError, e:
++            except(ldap.LDAPError, e):
+                 _log.info(e)
+ 
+             finally:
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..afbba03
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001_fix_exception_syntax.patch

-- 
mediagoblin packaging



More information about the pkg-multimedia-commits mailing list