[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 114/246] devtool: reset: allow reset to work if the recipe file has been deleted



commit 2fcc8d6e5253c4e9a76fa7b87f7a5d20ad29f0dd
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Jul 7 11:57:11 2016 +1200

    devtool: reset: allow reset to work if the recipe file has been deleted
    
    We were attempting to open the recipe file unconditionally here - we
    need to account for the possibility that the recipe file has been
    deleted or moved away by the user.
    
    (From OE-Core rev: 47822a2aff56fd338c16b5ad756feda9f395a8a1)
    
    (From OE-Core rev: 6fb1bb71b92d47eda48d24d3c0440b5219ac1fcd)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/standard.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 711399a..cdd76dc 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1320,7 +1320,7 @@ def reset(args, config, basepath, workspace):
         for recipe in recipes:
             targets.append(recipe)
             recipefile = workspace[recipe]['recipefile']
-            if recipefile:
+            if recipefile and os.path.exists(recipefile):
                 targets.extend(get_bbclassextend_targets(recipefile, recipe))
         try:
             exec_build_env_command(config.init_path, basepath, 'bitbake -c clean %s' % ' '.join(targets))


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