[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4045/8267] sanity.bbclass: Improved error message

[Emmanuele Bassi <ebassi src gnome org>]

commit fe84f7b33e817728dfea0210fc2b94a90f636ce3
Author: Juro Bystricky <juro bystricky intel com>
Date:   Thu Jan 12 14:07:58 2017 -0800

    sanity.bbclass: Improved error message
    
    When a non-existing MACHINE is specified, sanity check issues
    the following message:
    
        Please set a valid MACHINE in your local.conf or environment
    
    However, MACHINE can also be set in multiconfig .conf file(s).
    Hence we may have several different MACHINE settings within one
    (multiconfig) build, so the present error message is fairly
    ambiguous.
    
    This patch remedies this by explicitly naming the offending MACHINE and
    by amending the list of places where this erroneous MACHINE definition
    could have originated.
    
        MACHINE=xyz is invalid. Please set a valid MACHINE in your local.conf, environment or other 
configuration file.
    
    [YOCTO#10810]
    
    (From OE-Core rev: a7cb408dd784178197687a2129e936620bf6a0d3)
    
    Signed-off-by: Juro Bystricky <juro bystricky intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index c876dc6..c9bb034 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -823,7 +823,7 @@ def check_sanity_everybuild(status, d):
     machinevalid = True
     if d.getVar('MACHINE'):
         if not check_conf_exists("conf/machine/${MACHINE}.conf", d):
-            status.addresult('Please set a valid MACHINE in your local.conf or environment\n')
+            status.addresult('MACHINE=%s is invalid. Please set a valid MACHINE in your local.conf, 
environment or other configuration file.\n' % (d.getVar('MACHINE')))
             machinevalid = False
         else:
             status.addresult(check_sanity_validmachine(d))