From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 3 Feb 2011 18:24:25 +0000 (+0000)
Subject: bitbake/fetch2: Remove old local file acceleration code
X-Git-Tag: 2011-1~2517
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=282a828f3dc373d8f1397827ebbe1be1c54f2d2a;p=openembedded-core.git

bitbake/fetch2: Remove old local file acceleration code

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>
---

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 2e8dab9f57..daf8578f5f 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -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.