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

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

    Date: Friday, July 2, 2010 @ 17:51:54
  Author: vicho-guest
Revision: 5724

removed patch fix_regression_in_python_2_6_5

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

Deleted: 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	2010-07-02 17:51:10 UTC (rev 5723)
+++ packages/mercurial/trunk/debian/patches/from_upstream__fix_regression_in_python_2_6_5	2010-07-02 17:51:54 UTC (rev 5724)
@@ -1,18 +0,0 @@
-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-07-02 17:51:10 UTC (rev 5723)
+++ packages/mercurial/trunk/debian/patches/series	2010-07-02 17:51:54 UTC (rev 5724)
@@ -8,4 +8,3 @@
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
-from_upstream__fix_regression_in_python_2_6_5