From b2a0c2fbd1e4a0808c9594eb283395f5608ba4e9 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 4 Aug 2015 18:23:59 +0200 Subject: 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 Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/combo-layer') 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) -- cgit v1.2.3-54-g00ecf