sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

combo-layer: enhance output in action_pull 

The git operations can fail, for example when the branch is unknown
or misconfigured.

Better move the info message and extend it such that it is printed
first and provides the necessary context, because otherwise the
CalledProcessError exception gets dumped without mentioning for which
component it occurred.

(From OE-Core rev: 00d01468a692faf4272894dd328e8c532bcf8b49)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Patrick Ohly 2015-08-04 18:23:59 +02:00 committed by Richard Purdie
parent 0658434ee3
commit b2a0c2fbd1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/combo-layer
View File

@ -585,8 +585,8 @@ def action_pull(conf, args):
repo = conf.repos[name]
ldir = repo['local_repo_dir']
branch = repo.get('branch', "master")
logger.info("update branch %s of component repo %s in %s ..." % (branch, name, ldir))
runcmd("git checkout %s" % branch, ldir)
logger.info("update component repo %s in %s ..." % (name, ldir))
if not conf.hard_reset:
output=runcmd("git pull --ff-only", ldir)
logger.info(output)