[yum/f19: 5/6] Revert "same-mirror retry also on timeout. BZ 853432" ... so we can merge with master.

[James Antill]

commit 790ce6e4b2b19dfcece4e8fbc087dd6ecba28e26
Author: James Antill <james at and.org>
Date:   Mon Jun 3 11:51:00 2013 -0400

    Revert "same-mirror retry also on timeout.  BZ 853432" ... so we can
    merge with master.
    
    This reverts commit 78518f346835b69d5bee16504e60619229eabd53.

 yum-HEAD.patch |   26 --------------------------
 yum.spec       |    5 +----
 2 files changed, 1 insertions(+), 30 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 5a71298..c602cce 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -201916,29 +201916,3 @@ index 9f79f4f..ac94f65 100755
      errcode = None
      if 'YUM_PROF' in os.environ:
          if os.environ['YUM_PROF'] == 'cprof':
-commit 31a4a3bcb48b67231dc0314d9ed2693eb1e41b6d
-Author: Zdenek Pavlas <zpavlas at redhat.com>
-Date:   Fri May 10 12:23:09 2013 +0200
-
-    same-mirror retry also on timeout.  BZ 853432
-    
-    We should be able to retry on timeouts, too.
-    Works around connection-limited ftpds, that
-    may block for too long.
-
-diff --git a/yum/yumRepo.py b/yum/yumRepo.py
-index 2e4fcd9..41d180e 100644
---- a/yum/yumRepo.py
-+++ b/yum/yumRepo.py
-@@ -631,8 +631,9 @@ class YumRepository(Repository, config.RepoConf):
-         def mirror_failure(obj):
-             action = {}
- 
--            # special handling of 503 errors
--            if getattr(obj.exception, 'code', 0) == 503:
-+            # timeouts and 503 errors may retry
-+            e = obj.exception
-+            if e.errno == 12 or getattr(e, 'code', 0) == 503:
-                 tries = getattr(obj, 'tries', self.retries)
-                 if tries <= self.retries - len(self.urls):
-                     # don't remove this mirror yet
diff --git a/yum.spec b/yum.spec
index 7b7de40..9a0a1da 100644
--- a/yum.spec
+++ b/yum.spec
@@ -41,7 +41,7 @@ BuildRequires: bash-completion
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
-Release: 91%{?dist}
+Release: 90%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -402,9 +402,6 @@ exit 0
 %endif
 
 %changelog
-* Mon May 13 2013 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-91
-- same-mirror retry also on timeout.  BZ 853432
-
 * Wed May  8 2013 James Antill <james at fedoraproject.org> - 3.4.3-90
 - Massive hack for Fedora/updateinfo stable vs. testing statuses. BZ 960642.
 - Don't load updateinfo when we don't have to.