]> code.ossystems Code Review - openembedded-core.git/commitdiff
bitbake/fetch: fix by moving try_premirror() to the right place
authorJoshua Lock <josh@linux.intel.com>
Wed, 8 Sep 2010 14:04:17 +0000 (15:04 +0100)
committerJoshua Lock <josh@linux.intel.com>
Wed, 8 Sep 2010 14:09:07 +0000 (15:09 +0100)
The previous commit didn't define the method as part of the Fetch object

Signed-off-by: Joshua Lock <josh@linux.intel.com>
bitbake/lib/bb/fetch/__init__.py

index 2b0b288df0d26f69d5f3a46c62758c6f86751824..a27b40f6ac2939f7523eafea53b816d97490a857 100644 (file)
@@ -222,18 +222,6 @@ def init(urls, d, setup = True):
     urldata_cache[fn] = urldata
     return urldata
 
-def try_premirror(u, ud, d):
-    """
-    Should we try premirrors for this url, u?
-    We should if forcefetch is set or the localfile and md5 don't exist
-    """
-    if ud.method.forcefetch(u, ud, d):
-        return True
-    elif os.path.exists(ud.md5) and os.path.exists(ud.localfile):
-        return False
-    else:
-        return True
-
 def go(d, urls = None):
     """
     Fetch all urls
@@ -590,6 +578,17 @@ class Fetch(object):
         """
         raise NoMethodError("Missing implementation for url")
 
+    def try_premirror(self, url, urldata, d):
+        """
+        Should premirrors be used?
+        """
+        if urldata.method.forcefetch(url, urldata, d):
+            return True
+        elif os.path.exists(urldata.md5) and os.path.exists(urldata.localfile):
+            return False
+        else:
+            return True
+
     def checkstatus(self, url, urldata, d):
         """
         Check the status of a URL