diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-02 16:48:24 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:23 +0000 |
| commit | 61475f0267d40c618ebf36023d0b6414a25975cb (patch) | |
| tree | 73888689c3e3f4de32c3ebdcf079c04987557298 | |
| parent | 89e9d8fc7f99fb6346dc035e51abbc942011d9b5 (diff) | |
| download | openembedded-core-61475f0267d40c618ebf36023d0b6414a25975cb.tar.gz openembedded-core-61475f0267d40c618ebf36023d0b6414a25975cb.tar.bz2 openembedded-core-61475f0267d40c618ebf36023d0b6414a25975cb.zip | |
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@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@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) |