summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-03 13:54:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:36 (GMT)
commitc04305e6958add5a8c21422185d32d29116ab3d6 (patch)
tree0a39dc72f89af985a28a4439c6bd18ebe3120c34 /scripts/combo-layer
parentf82983034e63b46fb149f4559bbdfe486f22f520 (diff)
downloadpoky-c04305e6958add5a8c21422185d32d29116ab3d6.tar.gz
scripts/combo-layer: improve some messages
Fix some grammar. (From OE-Core rev: cc34f1bf136409d2e31c443dd5334c3a35d208af) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index e2b180d..597d6cb 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -71,7 +71,7 @@ class Configuration(object):
71 if option not in self.repos[name]: 71 if option not in self.repos[name]:
72 msg = "%s\nOption %s is not defined for component %s" %(msg, option, name) 72 msg = "%s\nOption %s is not defined for component %s" %(msg, option, name)
73 if msg != "": 73 if msg != "":
74 logger.error("configuration file %s has the following error:%s" % (self.conffile,msg)) 74 logger.error("configuration file %s has the following error: %s" % (self.conffile,msg))
75 sys.exit(1) 75 sys.exit(1)
76 76
77 # filterdiff is required by action_splitpatch, so check its availability 77 # filterdiff is required by action_splitpatch, so check its availability
@@ -145,7 +145,7 @@ def check_repo_clean(repodir):
145 145
146def action_update(conf, args): 146def action_update(conf, args):
147 """ 147 """
148 update the component repo 148 update the component repos
149 generate the patch list 149 generate the patch list
150 apply the generated patches 150 apply the generated patches
151 """ 151 """
@@ -178,7 +178,7 @@ def action_update(conf, args):
178 else: 178 else:
179 prefix = "" 179 prefix = ""
180 if repo['last_revision'] == "": 180 if repo['last_revision'] == "":
181 logger.info("Warning: last_revision of component %s is not set, so start from the first commit" % name) 181 logger.info("Warning: last_revision of component %s is not set, starting from the first commit" % name)
182 patch_cmd_range = "--root %s" % branch 182 patch_cmd_range = "--root %s" % branch
183 rev_cmd_range = branch 183 rev_cmd_range = branch
184 else: 184 else:
@@ -218,12 +218,12 @@ def action_update(conf, args):
218 if conf.interactive: 218 if conf.interactive:
219 print 'Edit the patch and patch list in %s\n' \ 219 print 'Edit the patch and patch list in %s\n' \
220 'For example, remove the unwanted patch entry from patchlist-*, so that it will be not applied later\n' \ 220 'For example, remove the unwanted patch entry from patchlist-*, so that it will be not applied later\n' \
221 'After finish, press following command to continue\n' \ 221 'When you are finished, run the following to continue:\n' \
222 ' exit 0 -- exit and continue to apply the patch\n' \ 222 ' exit 0 -- exit and continue to apply the patch\n' \
223 ' exit 1 -- abort and not apply patch\n' % patch_dir 223 ' exit 1 -- abort and do not apply the patch\n' % patch_dir
224 ret = subprocess.call(["bash"], cwd=patch_dir) 224 ret = subprocess.call(["bash"], cwd=patch_dir)
225 if ret != 0: 225 if ret != 0:
226 print "Abort without applying patch" 226 print "Aborting without applying the patch"
227 sys.exit(0) 227 sys.exit(0)
228 228
229 # Step 6: apply the generated and revised patch 229 # Step 6: apply the generated and revised patch
@@ -257,11 +257,11 @@ def action_apply_patch(conf, args):
257 try: 257 try:
258 runcmd(cmd) 258 runcmd(cmd)
259 except subprocess.CalledProcessError: 259 except subprocess.CalledProcessError:
260 logger.info('"git am --abort" is executed to cleanup repo') 260 logger.info('running "git am --abort" to cleanup repo')
261 runcmd("git am --abort") 261 runcmd("git am --abort")
262 logger.error('"%s" failed' % cmd) 262 logger.error('"%s" failed' % cmd)
263 logger.info("please manually apply patch %s" % patchfile) 263 logger.info("please manually apply patch %s" % patchfile)
264 logger.info("After applying, run this tool again to apply the rest patches") 264 logger.info("After applying, run this tool again to apply the remaining patches")
265 conf.update(name, "last_revision", lastrev) 265 conf.update(name, "last_revision", lastrev)
266 sys.exit(0) 266 sys.exit(0)
267 conf.update(name, "last_revision", lastrev) 267 conf.update(name, "last_revision", lastrev)