diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2015-08-04 18:23:59 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-09 00:12:41 -0700 |
| commit | 00d01468a692faf4272894dd328e8c532bcf8b49 (patch) | |
| tree | 400878f8db4e2025bcc8189b2b777d31c28fee09 /scripts/combo-layer | |
| parent | d168bf34c553dbe5de7511e158cd83869d7a88bc (diff) | |
| download | openembedded-core-00d01468a692faf4272894dd328e8c532bcf8b49.tar.gz openembedded-core-00d01468a692faf4272894dd328e8c532bcf8b49.tar.bz2 openembedded-core-00d01468a692faf4272894dd328e8c532bcf8b49.zip | |
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@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 2 |
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): 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) |