summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
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 /meta/classes/package.bbclass
parentae8586c95215687db1978ef7998a1756bc4c69b1 (diff)
downloadast2050-yocto-poky-b0a2f55ccc8f9850e7de5bb9a1683abbe6fd2b43.zip
ast2050-yocto-poky-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>
Diffstat (limited to 'meta/classes/package.bbclass')
-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 8b256cf..51ab009 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -961,12 +961,12 @@ python populate_packages () {
bb.data.update_data(localdata)
filesvar = localdata.getVar('FILES', True) or ""
+ if "//" in filesvar:
+ bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg)
+ filesvar.replace("//", "/")
files = filesvar.split()
file_links = {}
for file in files:
- if file.find("//") != -1:
- bb.warn("FILES variable for package %s contains '//' which is invalid. Attempting to fix this but you should correct the metadata.\n" % pkg)
- file.replace("//", "/")
if os.path.isabs(file):
file = '.' + file
if not os.path.islink(file):
OpenPOWER on IntegriCloud