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

login
register
mail settings
Submitter Robert P. J. Day
Date July 26, 2012, 8:55 p.m.
Message ID <alpine.DEB.2.02.1207261653110.20795@oneiric>
Download mbox | patch
Permalink /patch/33167/
State New
Headers show

Comments

Robert P. J. Day - July 26, 2012, 8:55 p.m.
"error_promt" -> "error_prompt" changed in both places
"subfolers" -> "subfolders" since it's not referenced anyway

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---
Richard Purdie - July 29, 2012, 9:31 a.m.
On Thu, 2012-07-26 at 16:55 -0400, Robert P. J. Day wrote:
> "error_promt" -> "error_prompt" changed in both places
> "subfolers" -> "subfolders" since it's not referenced anyway
> 
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>


Merged to master, thanks.

Richard

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1799bf1..0a380f1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -266,12 +266,12 @@  import sys, os, os.path
 import re,filecmp

 allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}"))
-error_promt="Multilib check error:"
+error_prompt="Multilib check error:"

 files={}
 dirs=raw_input()
 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:
       item=os.path.join(root,file)
       key=str(os.path.join("/",os.path.relpath(item,dir)))
@@ -284,7 +284,7 @@  for dir in dirs.split():
         else:
           if not filecmp.cmp(files[key],item):
              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)

       #pass the check, add to list