From: Patrick Ohly Date: Tue, 4 Aug 2015 16:23:59 +0000 (+0200) Subject: combo-layer: enhance output in action_pull X-Git-Tag: 2015-10~966 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=00d01468a692faf4272894dd328e8c532bcf8b49;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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): 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)