summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch2/local.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py
index 2ff77234e5..a114ac12e5 100644
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/bitbake/lib/bb/fetch2/local.py
@@ -67,12 +67,6 @@ class Local(FetchMethod):
67 logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":")))) 67 logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":"))))
68 newpath, hist = bb.utils.which(filespath, path, history=True) 68 newpath, hist = bb.utils.which(filespath, path, history=True)
69 searched.extend(hist) 69 searched.extend(hist)
70 if not newpath:
71 filesdir = d.getVar('FILESDIR')
72 if filesdir:
73 logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
74 newpath = os.path.join(filesdir, path)
75 searched.append(newpath)
76 if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1: 70 if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1:
77 # For expressions using '*', best we can do is take the first directory in FILESPATH that exists 71 # For expressions using '*', best we can do is take the first directory in FILESPATH that exists
78 newpath, hist = bb.utils.which(filespath, ".", history=True) 72 newpath, hist = bb.utils.which(filespath, ".", history=True)
@@ -102,9 +96,6 @@ class Local(FetchMethod):
102 filespath = d.getVar('FILESPATH') 96 filespath = d.getVar('FILESPATH')
103 if filespath: 97 if filespath:
104 locations = filespath.split(":") 98 locations = filespath.split(":")
105 filesdir = d.getVar('FILESDIR')
106 if filesdir:
107 locations.append(filesdir)
108 locations.append(d.getVar("DL_DIR")) 99 locations.append(d.getVar("DL_DIR"))
109 100
110 msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations) 101 msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations)