[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5644/8267] oe-selftest: Error if known problem variables are set

[Emmanuele Bassi <ebassi src gnome org>]

commit ffabe5d1b9539c6cc9fc87ecff9d40f69f8df9be
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Apr 12 19:54:20 2017 +0100

    oe-selftest: Error if known problem variables are set
    
    Setting SANITY_TESTED_DISTROS or PRSERV_HOST are known to break oe-selftest.
    Rather than have the user experience this, refuse to execute unless the
    environment is correct.
    
    Ideally we'd try and unset these but that is a more invasive change and this
    at least makes people aware of the problem.
    
    [YOCTO #11292]
    
    (From OE-Core rev: 0c9b981e88c76da316e76f17e6da3a03b87c5008)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/oe-selftest |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 58d3b1e..52366b1 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -146,6 +146,14 @@ def preflight_check():
         log.error("You have buildhistory enabled already and this isn't recommended for selftest, please 
disable it first.")
         return False
 
+    if get_bb_var("PRSERV_HOST"):
+        log.error("Please unset PRSERV_HOST in order to run oe-selftest")
+        return False
+
+    if get_bb_var("SANITY_TESTED_DISTROS"):
+        log.error("Please unset SANITY_TESTED_DISTROS in order to run oe-selftest")
+        return False
+
     log.info("Running bitbake -p")
     runCmd("bitbake -p")