diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-10-31 11:30:49 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-11 12:14:27 +0000 |
commit | 46a3662d4e441b8c6148b00096faeb93ab5447a9 (patch) | |
tree | 5a593388f3f6bbf8805157874e84b3815d1fcadb /scripts/lib | |
parent | fcb84383ce9b555c13772515ec4f1f1f9b34737d (diff) | |
download | poky-46a3662d4e441b8c6148b00096faeb93ab5447a9.tar.gz |
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)"
(From OE-Core rev: 2d11e9e6e73648c1cb514c0c10111c7886acae78)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/upgrade.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 0db2a50e90..3cb523c2f4 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 | |||
263 | 263 | ||
264 | if no_patch: | 264 | if no_patch: |
265 | patches = oe.recipeutils.get_recipe_patches(crd) | 265 | patches = oe.recipeutils.get_recipe_patches(crd) |
266 | if len(patches): | 266 | if patches: |
267 | logger.warn('By user choice, the following patches will NOT be applied') | 267 | 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])) |
268 | for patch in patches: | ||
269 | logger.warn("%s" % os.path.basename(patch)) | ||
270 | else: | 268 | else: |
271 | __run('git checkout devtool-patched -b %s' % branch) | 269 | __run('git checkout devtool-patched -b %s' % branch) |
272 | skiptag = False | 270 | skiptag = False |