summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1799bf1865..0a380f1172 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -266,12 +266,12 @@ import sys, os, os.path
266import re,filecmp 266import re,filecmp
267 267
268allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}")) 268allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}"))
269error_promt="Multilib check error:" 269error_prompt="Multilib check error:"
270 270
271files={} 271files={}
272dirs=raw_input() 272dirs=raw_input()
273for dir in dirs.split(): 273for dir in dirs.split():
274 for root, subfolers, subfiles in os.walk(dir): 274 for root, subfolders, subfiles in os.walk(dir):
275 for file in subfiles: 275 for file in subfiles:
276 item=os.path.join(root,file) 276 item=os.path.join(root,file)
277 key=str(os.path.join("/",os.path.relpath(item,dir))) 277 key=str(os.path.join("/",os.path.relpath(item,dir)))
@@ -284,7 +284,7 @@ for dir in dirs.split():
284 else: 284 else:
285 if not filecmp.cmp(files[key],item): 285 if not filecmp.cmp(files[key],item):
286 valid=False 286 valid=False
287 print("%s duplicate files %s %s is not the same\n" % (error_promt, item, files[key])) 287 print("%s duplicate files %s %s is not the same\n" % (error_prompt, item, files[key]))
288 sys.exit(1) 288 sys.exit(1)
289 289
290 #pass the check, add to list 290 #pass the check, add to list