[oe-commits] [openembedded-core] 80/84: lib/oe/recipeutils: print just filename in bbappend_recipe() if in temp dir

[git at git.openembedded.org]

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

commit e41f2b91fcb7f6caf28cce133bda6f0ea6df1f3e
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Wed Nov 2 16:48:24 2016 +1300

    lib/oe/recipeutils: print just filename in bbappend_recipe() if in temp dir
    
    If you use devtool update-recipe with the --append option, and a "local"
    (in oe-local-files) has been modified we copy it into the specified
    destination layer. With the way the devtool update-recipe code works now
    the source is always a temp directory, and printing paths from within
    that is just confusing, so if the path starts with the temp directory
    then just print the file name alone.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oe/recipeutils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 58e4028..6caae5f 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -786,7 +786,11 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
         for newfile, srcfile in copyfiles.items():
             filedest = os.path.join(appenddir, destsubdir, os.path.basename(srcfile))
             if os.path.abspath(newfile) != os.path.abspath(filedest):
-                bb.note('Copying %s to %s' % (newfile, filedest))
+                if newfile.startswith(tempfile.gettempdir()):
+                    newfiledisp = os.path.basename(newfile)
+                else:
+                    newfiledisp = newfile
+                bb.note('Copying %s to %s' % (newfiledisp, filedest))
                 bb.utils.mkdirhier(os.path.dirname(filedest))
                 shutil.copyfile(newfile, filedest)
 

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