[Python-apps-commits] r11366 - in packages/osc/trunk/debian (4 files)

[nijel at users.alioth.debian.org]

    Date: Monday, October 6, 2014 @ 07:49:50
  Author: nijel
Revision: 11366

Fixed commiting new package (Closes: #762825).

Added:
  packages/osc/trunk/debian/patches/
  packages/osc/trunk/debian/patches/fix-urllib2-workaround.patch
  packages/osc/trunk/debian/patches/series
Modified:
  packages/osc/trunk/debian/changelog

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2014-10-06 07:35:03 UTC (rev 11365)
+++ packages/osc/trunk/debian/changelog	2014-10-06 07:49:50 UTC (rev 11366)
@@ -1,6 +1,7 @@
 osc (0.148.1-2) UNRELEASED; urgency=medium
 
   * NOT RELEASED YET
+  * Fixed commiting new package (Closes: #762825).
 
  -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 22 Sep 2014 10:57:44 +0200
 

Added: packages/osc/trunk/debian/patches/fix-urllib2-workaround.patch
===================================================================
--- packages/osc/trunk/debian/patches/fix-urllib2-workaround.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/fix-urllib2-workaround.patch	2014-10-06 07:49:50 UTC (rev 11366)
@@ -0,0 +1,26 @@
+From 2f14cedcff96d7991c97604b94717f1c927c5d4e Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at debian.org>
+Date: Fri, 26 Sep 2014 09:54:03 +0200
+Subject: [PATCH 1/1] Fix condition for using urllib2 workaround
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762825
+---
+ osc/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/osc/conf.py b/osc/conf.py
+index d78f2aa..dfc25dc 100644
+--- a/osc/conf.py
++++ b/osc/conf.py
+@@ -450,7 +450,7 @@ def _build_opener(url):
+ 
+     # workaround for http://bugs.python.org/issue9639
+     authhandler_class = HTTPBasicAuthHandler
+-    if sys.version_info >= (2, 6, 6) and sys.version_info < (2, 7, 1) \
++    if sys.version_info >= (2, 6, 6) and sys.version_info < (2, 7, 99) \
+         and not 'reset_retry_count' in dir(HTTPBasicAuthHandler):
+         print('warning: your urllib2 version seems to be broken. ' \
+             'Using a workaround for http://bugs.python.org/issue9639', file=sys.stderr)
+-- 
+1.8.4.5
+

Added: packages/osc/trunk/debian/patches/series
===================================================================
--- packages/osc/trunk/debian/patches/series	                        (rev 0)
+++ packages/osc/trunk/debian/patches/series	2014-10-06 07:49:50 UTC (rev 11366)
@@ -0,0 +1 @@
+fix-urllib2-workaround.patch