summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorNing Zhang <ning.zhang@windriver.com>2013-06-03 05:21:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-04 10:47:23 (GMT)
commit96edb2002a014b4644da974444e8fa479dda427f (patch)
tree47fba3544752f90276775f34684787decc8e6bea /scripts/lib
parentc252ed989dea10c558b7f1c8e995700a0ea8d257 (diff)
downloadpoky-96edb2002a014b4644da974444e8fa479dda427f.tar.gz
yocto_kernel: modify the msg when adding duplicate items
Privious check-in "yocto_kernel: check current items before add a new one" had been merged before I apply the feedback from Zanussi, Tom. Now fix it as a new patch. This fix modify the output message when customer adding duplicate items. [YOCTO #4558] (From meta-yocto rev: 530c6efa85b1798d30db4c6c83a748b100b8c1c3) Signed-off-by: Ning Zhang <ning.zhang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/kernel.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
index 9ed6e94..94ae950 100644
--- a/scripts/lib/bsp/kernel.py
+++ b/scripts/lib/bsp/kernel.py
@@ -260,7 +260,7 @@ def yocto_kernel_config_add(scripts_path, machine, config_items):
260 print "\t%s" % n 260 print "\t%s" % n
261 261
262 if len(dup_items) > 0: 262 if len(dup_items) > 0:
263 output="Below item%s already exist%s in current configuration, ignore %s" % \ 263 output="The following item%s already exist%s in the current configuration, ignoring %s:" % \
264 (("","s", "it") if len(dup_items)==1 else ("s", "", "them" )) 264 (("","s", "it") if len(dup_items)==1 else ("s", "", "them" ))
265 print output 265 print output
266 for n in dup_items: 266 for n in dup_items: