[oe-commits] Patrick Ohly : combo-layer: enhance output in action_pull
git at git.openembedded.org
git at git.openembedded.org
Fri Aug 7 03:50:29 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 9f3db0401c81ba5d15035f0f2e023d6cf620188e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9f3db0401c81ba5d15035f0f2e023d6cf620188e
Author: Patrick Ohly <patrick.ohly at intel.com>
Date: Tue Aug 4 18:23:59 2015 +0200
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.
Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/combo-layer | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 70dad83..7380f5b 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -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)
More information about the Openembedded-commits
mailing list