From bb88a07034df280a6a74f1d1ee9ad5b1e013ad7f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 29 Jan 2013 13:49:56 +0000 Subject: [PATCH] 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 --- meta/classes/package.bbclass | 6 +++--- 1 file 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): -- 2.7.4