[oe-commits] [bitbake] branch master-next updated: fetch2/wget: attempt checkstatus again if it fails

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

The following commit(s) were added to refs/heads/master-next by this push:
       new  54b1961   fetch2/wget: attempt checkstatus again if it fails
54b1961 is described below

commit 54b1961551511948e0cbd2ac39f19b39b9cee568
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Thu Jun 30 22:32:24 2016 +0100

    fetch2/wget: attempt checkstatus again if it fails
    
    Some services such as SourceForge seem to struggle to keep up under load, with
    the result that over half of the autobuilder checkuri runs fail with
    sourceforge.net "connection timed out".
    
    Attempt to mitigate this by re-attempting once the network operation on failure.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/wget.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py
index d688fd9..6cb22ae 100644
--- a/lib/bb/fetch2/wget.py
+++ b/lib/bb/fetch2/wget.py
@@ -104,7 +104,7 @@ class Wget(FetchMethod):
 
         return True
 
-    def checkstatus(self, fetch, ud, d):
+    def checkstatus(self, fetch, ud, d, try_again=True):
         import urllib.request, urllib.error, urllib.parse, socket, http.client
         from urllib.response import addinfourl
         from bb.fetch2 import FetchConnectionCache
@@ -278,9 +278,13 @@ class Wget(FetchMethod):
             r.get_method = lambda: "HEAD"
             opener.open(r)
         except urllib.error.URLError as e:
-            # debug for now to avoid spamming the logs in e.g. remote sstate searches
-            logger.debug(2, "checkstatus() urlopen failed: %s" % e)
-            return False
+            if try_again:
+                logger.debug(2, "checkstatus: trying again")
+                return self.checkstatus(fetch, ud, d, False)
+            else:
+                # debug for now to avoid spamming the logs in e.g. remote sstate searches
+                logger.debug(2, "checkstatus() urlopen failed: %s" % e)
+                return False
         return True
 
     def _parse_path(self, regex, s):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.