[Python-apps-commits] r5669 - in packages/mercurial/trunk/debian/patches (2 files)

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

    Date: Thursday, June 24, 2010 @ 10:57:35
  Author: vicho-guest
Revision: 5669

Added patch to fix a regression in python 2.6.5.

Added:
  packages/mercurial/trunk/debian/patches/from_upstream__fix_regression_in_python_2_6_5
Modified:
  packages/mercurial/trunk/debian/patches/series

Added: packages/mercurial/trunk/debian/patches/from_upstream__fix_regression_in_python_2_6_5
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__fix_regression_in_python_2_6_5	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/from_upstream__fix_regression_in_python_2_6_5	2010-06-24 10:57:35 UTC (rev 5669)
@@ -0,0 +1,18 @@
+Fix a regression in python 2.6.5. This patch is changeset a1e575b48563 from upstream.
+Close: #586907
+--- a/mercurial/url.py
++++ b/mercurial/url.py
+@@ -556,6 +556,13 @@
+                 return
+             raise
+ 
++    # Python 2.6.5 will keep resetting the retry count on redirects, for
++    # example when the server returns 401 on failing auth (like google code
++    # currently does). We stop the endless recursion by not resetting the
++    # count.
++    def reset_retry_count(self):
++        pass
++
+ def getauthinfo(path):
+     scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path)
+     if not urlpath:

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2010-06-24 09:31:55 UTC (rev 5668)
+++ packages/mercurial/trunk/debian/patches/series	2010-06-24 10:57:35 UTC (rev 5669)
@@ -9,3 +9,4 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
 for_upstream__bashism_in_examples.patch
+from_upstream__fix_regression_in_python_2_6_5