aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-10-31 11:30:49 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-10 14:44:31 +0000
commit2d11e9e6e73648c1cb514c0c10111c7886acae78 (patch)
tree95b85c52ec1dd96989a9bbbc96ab5cc46f528aee /scripts
parentd29881a652bf03627d257a1eac5f02ec17315b8b (diff)
downloadopenembedded-core-2d11e9e6e73648c1cb514c0c10111c7886acae78.zip
openembedded-core-2d11e9e6e73648c1cb514c0c10111c7886acae78.tar.gz
openembedded-core-2d11e9e6e73648c1cb514c0c10111c7886acae78.tar.bz2
devtool: upgrade: reformat --no-patch warning message
* Only log one warning message instead of one per line * Be a bit more verbose * "if list" is more pythonic than "if len(list)" Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/upgrade.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 0db2a50..3cb523c 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -263,10 +263,8 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
if no_patch:
patches = oe.recipeutils.get_recipe_patches(crd)
- if len(patches):
- logger.warn('By user choice, the following patches will NOT be applied')
- for patch in patches:
- logger.warn("%s" % os.path.basename(patch))
+ if patches:
+ logger.warn('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches]))
else:
__run('git checkout devtool-patched -b %s' % branch)
skiptag = False