1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00

image.bbclass: Fix a couple innocuous typoes, should cause no functional change

"error_promt" -> "error_prompt" changed in both places
"subfolers" -> "subfolders" since it's not referenced anyway

(From OE-Core rev: cc1f824778c023686b4ea75c64a182a138ff2267)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert P. J. Day
2012-07-26 16:55:43 -04:00
committed by Richard Purdie
parent a5227e205b
commit 6c93f7095e
+3 -3
View File
@@ -266,12 +266,12 @@ import sys, os, os.path
import re,filecmp import re,filecmp
allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}")) allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}"))
error_promt="Multilib check error:" error_prompt="Multilib check error:"
files={} files={}
dirs=raw_input() dirs=raw_input()
for dir in dirs.split(): for dir in dirs.split():
for root, subfolers, subfiles in os.walk(dir): for root, subfolders, subfiles in os.walk(dir):
for file in subfiles: for file in subfiles:
item=os.path.join(root,file) item=os.path.join(root,file)
key=str(os.path.join("/",os.path.relpath(item,dir))) key=str(os.path.join("/",os.path.relpath(item,dir)))
@@ -284,7 +284,7 @@ for dir in dirs.split():
else: else:
if not filecmp.cmp(files[key],item): if not filecmp.cmp(files[key],item):
valid=False valid=False
print("%s duplicate files %s %s is not the same\n" % (error_promt, item, files[key])) print("%s duplicate files %s %s is not the same\n" % (error_prompt, item, files[key]))
sys.exit(1) sys.exit(1)
#pass the check, add to list #pass the check, add to list