[oe-commits] [bitbake] 13/18: toaster: keep layer name in variable history path

[git at git.openembedded.org]

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

commit 59561d652af91c2099b735084f0e44275d68e637
Author: David Reyna <David.Reyna at windriver.com>
AuthorDate: Mon Sep 5 15:29:28 2016 +0100

    toaster: keep layer name in variable history path
    
    When converting variable history file names to relative
    paths, keep the layer directory's name so that the user
    can distinguish between conf files with the same name.
    
    [YOCTO #8188]
    
    Signed-off-by: David Reyna <david.reyna at windriver.com>
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/ui/buildinfohelper.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 0f09b5c..96166dc 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/lib/bb/ui/buildinfohelper.py
@@ -1127,7 +1127,8 @@ class BuildInfoHelper(object):
                         abs_file_name = vh['file']
                         for pp in path_prefixes:
                             if abs_file_name.startswith(pp + "/"):
-                                vh['file']=abs_file_name[len(pp + "/"):]
+                                # preserve layer name in relative path
+                                vh['file']=abs_file_name[pp.rfind("/")+1:]
                                 break
 
         # save the variables

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