Patchwork sanity.bbclass: Add check for @ character in build directory name

login
register
mail settings
Submitter Richard Purdie
Date June 25, 2013, 5:08 p.m.
Message ID <1372180081.9930.91.camel@ted>
Download mbox | patch
Permalink /patch/52331/
State Accepted
Commit 4707a74db3822f5ad26e720fa47dd011c5d32a1c
Headers show

Comments

Richard Purdie - June 25, 2013, 5:08 p.m.
The @ character is not escaped properly in too many places within the system
to easily support it so add the character to the list of blacklisted characters.

Also tweak the other messages and ensure that all appropriate error messages
are disabled in one go.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 622bb41..cf23982 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -589,10 +589,12 @@  def check_sanity_everybuild(status, d):
             pass
 
     oeroot = d.getVar('COREBASE')
-    if oeroot.find ('+') != -1:
-        status.addresult("Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include a +.")
-    elif oeroot.find (' ') != -1:
-        status.addresult("Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space.")
+    if oeroot.find('+') != -1:
+        status.addresult("Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include any + characters.")
+    if oeroot.find('@') != -1:
+        status.addresult("Error, you have an invalid character (@) in your COREBASE directory path. Please move the installation to a directory which doesn't include any @ characters.")
+    if oeroot.find(' ') != -1:
+        status.addresult("Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space since autotools doesn't support this.")
 
     # Check that TMPDIR hasn't changed location since the last time we were run
     tmpdir = d.getVar('TMPDIR', True)