[oe-commits] Alexandru DAMIAN : scripts/oe-selftest: fix startup backtrace

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 0d769abcab272f41d74ed4d7915d26c7c309253a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0d769abcab272f41d74ed4d7915d26c7c309253a

Author: Alexandru DAMIAN <alexandru.damian at intel.com>
Date:   Wed Feb  4 14:13:56 2015 +0000

scripts/oe-selftest: fix startup backtrace

Fixing a backtrace dump that happens if the script is started
without sourcing the oe-init-build-env first.

Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/oe-selftest | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 2332b22..74c998b 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -102,6 +102,8 @@ def add_include():
 
 def remove_include():
     builddir = os.environ.get("BUILDDIR")
+    if builddir is None:
+        return
     if "#include added by oe-selftest.py" \
         in ftools.read_file(os.path.join(builddir, "conf/local.conf")):
             log.info("Removing the include from local.conf")
@@ -116,7 +118,7 @@ def remove_inc_files():
             for f in files:
                 if f == 'test_recipe.inc':
                     os.remove(os.path.join(root, f))
-    except OSError as e:
+    except (AttributeError, OSError,) as e:    # AttributeError may happen if BUILDDIR is not set
         pass
 
 def get_tests(exclusive_modules=[], include_hidden=False):