diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-02 16:48:24 +1300 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-03 15:55:25 +1300 |
commit | 3de9e8b258bd0de40ccfa8cf68dc7dfe707f4e30 (patch) | |
tree | 0aa84926907811c93a1549fab42b8e83389e5d67 | |
parent | 9e31853e4294e146648d9388ecaa8340b19077c4 (diff) | |
download | openembedded-core-contrib-paule/devtool-update-recipe.tar.gz |
lib/oe/recipeutils: print just filename in bbappend_recipe() if in temp dirpaule/devtool-update-recipe
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@linux.intel.com>
-rw-r--r-- | meta/lib/oe/recipeutils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 58e4028aed..6caae5f7d4 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) |