[oe-commits] [openembedded-core] 22/26: devtool: finish: fix erroneously creating bbappend for relative paths

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit e71e768e452572a3e73c24868046f7142c8912e1
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Mon Feb 26 14:49:57 2018 +1300

    devtool: finish: fix erroneously creating bbappend for relative paths
    
    After OE-Core rev 5e3fe00a0233d563781849a44f53885b4e924a9c we call
    os.path.abspath() on the original layer path, but we later compare that
    to the destination layer path. If that layer path isn't absolute but is
    effectively the same path, it should be writing to the original recipe
    but because we weren't making it absolute we were writing a bbappend
    instead. Call os.path.abspath() on the destination path as well to avoid
    that.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/devtool/standard.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 2dbb197..a962ebe 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1861,9 +1861,7 @@ def _get_layer(layername, d):
         layerdir = layers.get('meta', None)
     else:
         layerdir = layers.get(layername, None)
-    if layerdir:
-        layerdir = os.path.abspath(layerdir)
-    return layerdir or layername
+    return os.path.abspath(layerdir or layername)
 
 def finish(args, config, basepath, workspace):
     """Entry point for the devtool 'finish' subcommand"""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.