[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7606/8267] yocto-compat-layer.py: Fix trace when layers can't be processed



commit 7b53ae2c73d33f1f540b8092fc06dca2b6604830
Author: Mark Hatle <mark hatle windriver com>
Date:   Mon Sep 4 21:10:11 2017 -0500

    yocto-compat-layer.py: Fix trace when layers can't be processed
    
    When all of the requested layers have unsatisfied dependencies, an error
    can occur.  Check for the condition to avoid the traceback:
    
    Traceback (most recent call last):
      File "../scripts/yocto-compat-layer.py", line 203, in <module>
        ret =  main()
      File "../scripts/yocto-compat-layer.py", line 194, in main
        if not results[layer_name].wasSuccessful():
    AttributeError: 'NoneType' object has no attribute 'wasSuccessful'
    
    (From OE-Core rev: 32c9b3d99a0c27f6736696082b9da812a8464bf8)
    
    Signed-off-by: Mark Hatle <mark hatle windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/yocto-compat-layer.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/yocto-compat-layer.py b/scripts/yocto-compat-layer.py
index a16974f..9a541c6 100755
--- a/scripts/yocto-compat-layer.py
+++ b/scripts/yocto-compat-layer.py
@@ -191,7 +191,7 @@ def main():
         logger.info('')
         for layer_name in results_status:
             logger.info('%s ... %s' % (layer_name, results_status[layer_name]))
-            if not results[layer_name].wasSuccessful():
+            if not results[layer_name] or not results[layer_name].wasSuccessful():
                 ret = 2 # ret = 1 used for initialization errors
 
     cleanup_bblayers(None, None)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]