summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 13:56:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:15:11 +0100
commit2d3ff5e6e17c3c8e0ba000c696da54e51167f15d (patch)
tree5b42dffa2caccd1ea5be5ec0d943a920587b912d
parentf3a5ad170d73560b9515a5d55d10baa389a8e7bb (diff)
downloadpoky-2d3ff5e6e17c3c8e0ba000c696da54e51167f15d.tar.gz
bitbake/cooker: Ensure matchFile returns full pathnames
We should always be passing full pathnames around within bitbake. If a file was referenced as a relative path to the current working directory, it might not get passed through the abspath call and hence the cwd would not get added as a prefix. This change adds a second pass at ensuring we only return absolute paths. (Bitbake rev: 72fc62ca124a24e2dbe404a3c83a49608a7c7931) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8ad4922651..bafd832a67 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -985,12 +985,12 @@ class BBCooker:
985 """ 985 """
986 Find the .bb files which match the expression in 'buildfile'. 986 Find the .bb files which match the expression in 'buildfile'.
987 """ 987 """
988
989 if bf.startswith("/") or bf.startswith("../"): 988 if bf.startswith("/") or bf.startswith("../"):
990 bf = os.path.abspath(bf) 989 bf = os.path.abspath(bf)
991 filelist, masked = self.collect_bbfiles() 990 filelist, masked = self.collect_bbfiles()
992 try: 991 try:
993 os.stat(bf) 992 os.stat(bf)
993 bf = os.path.abspath(bf)
994 return [bf] 994 return [bf]
995 except OSError: 995 except OSError:
996 regexp = re.compile(bf) 996 regexp = re.compile(bf)