summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-29 13:49:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-01 15:54:01 +0000
commitb0a2f55ccc8f9850e7de5bb9a1683abbe6fd2b43 (patch)
treeee050e30f2209152cb5a2aa3ccafcf4a5f09df66
parentae8586c95215687db1978ef7998a1756bc4c69b1 (diff)
downloadpoky-b0a2f55ccc8f9850e7de5bb9a1683abbe6fd2b43.tar.gz
package.bbclass: Check FILES once, not once per loop iteration
There is no need to check FILES in each loop iteration, we can just check it once at the start when we read the variable. (From OE-Core rev: 1bcc5cba12cbb1b846b433719d1b0820f5a97105) (From OE-Core rev: 40542f7a46bfb8431e31eca9af06adb4b343d810) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8b256cf4ce..51ab009d88 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -961,12 +961,12 @@ python populate_packages () {
961 bb.data.update_data(localdata) 961 bb.data.update_data(localdata)
962 962
963 filesvar = localdata.getVar('FILES', True) or "" 963 filesvar = localdata.getVar('FILES', True) or ""
964 if "//" in filesvar:
965 bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg)
966 filesvar.replace("//", "/")
964 files = filesvar.split() 967 files = filesvar.split()
965 file_links = {} 968 file_links = {}
966 for file in files: 969 for file in files:
967 if file.find("//") != -1:
968 bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg)
969 file.replace("//", "/")
970 if os.path.isabs(file): 970 if os.path.isabs(file):
971 file = '.' + file 971 file = '.' + file
972 if not os.path.islink(file): 972 if not os.path.islink(file):