summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-08-04 18:23:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-09 00:13:57 -0700
commitb2a0c2fbd1e4a0808c9594eb283395f5608ba4e9 (patch)
treea0e8415276f7e5e62ceb5f289016f6140f45f5df /scripts/combo-layer
parent0658434ee3c97bc27b9aa7bde682309af5c2f3c3 (diff)
downloadpoky-b2a0c2fbd1e4a0808c9594eb283395f5608ba4e9.tar.gz
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>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 70dad83217..7380f5b959 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -585,8 +585,8 @@ def action_pull(conf, args):
585 repo = conf.repos[name] 585 repo = conf.repos[name]
586 ldir = repo['local_repo_dir'] 586 ldir = repo['local_repo_dir']
587 branch = repo.get('branch', "master") 587 branch = repo.get('branch', "master")
588 logger.info("update branch %s of component repo %s in %s ..." % (branch, name, ldir))
588 runcmd("git checkout %s" % branch, ldir) 589 runcmd("git checkout %s" % branch, ldir)
589 logger.info("update component repo %s in %s ..." % (name, ldir))
590 if not conf.hard_reset: 590 if not conf.hard_reset:
591 output=runcmd("git pull --ff-only", ldir) 591 output=runcmd("git pull --ff-only", ldir)
592 logger.info(output) 592 logger.info(output)