]> code.ossystems Code Review - openembedded-core.git/commitdiff
bitbake/fetch2: Remove old local file acceleration code
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 3 Feb 2011 18:24:25 +0000 (18:24 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 3 Feb 2011 18:24:25 +0000 (18:24 +0000)
Since local mirror fetches are always symlinked from the download directory
directly, there is no need for this premirrors hack which doesn't cover
mirrors and also abuses the localpath variable with inconsistent results.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/bb/fetch2/__init__.py

index 2e8dab9f572e5b61f14dfb7899c7dd52ffd0cafb..daf8578f5f3ee11ab2c46265ffc06bf0ee61bd08 100644 (file)
@@ -594,24 +594,10 @@ class FetchData(object):
             self.localpath = self.parm["localpath"]
             self.basename = os.path.basename(self.localpath)
         else:
-            premirrors = bb.data.getVar('PREMIRRORS', d, True)
-            local = ""
-            if premirrors and self.url:
-                aurl = self.url.split(";")[0]
-                mirrors = mirror_from_string(premirrors)
-                for (find, replace) in mirrors:
-                    if replace.startswith("file://"):
-                        path = aurl.split("://")[1]
-                        path = path.split(";")[0]
-                        local = replace.split("://")[1] + os.path.basename(path)
-                        if local == aurl or not os.path.exists(local) or os.path.isdir(local):
-                            local = ""
-                self.localpath = local
-            if not local:
-                self.localpath = self.method.localpath(self.url, self, d)
-                # We have to clear data's internal caches since the cached value of SRCREV is now wrong.
-                # Horrible...
-                bb.data.delVar("ISHOULDNEVEREXIST", d)
+            self.localpath = self.method.localpath(self.url, self, d)
+            # We have to clear data's internal caches since the cached value of SRCREV is now wrong.
+            # Horrible...
+            bb.data.delVar("ISHOULDNEVEREXIST", d)
 
         if self.localpath is not None:
             # Note: These files should always be in DL_DIR whereas localpath may not be.