diff options
| author | Alexander Kanevskiy <kad@linux.intel.com> | 2015-07-30 19:49:17 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 12:04:18 +0100 |
| commit | ac4ef551d506a5767946cf2fb717c2fd7f86df9c (patch) | |
| tree | e37be0b8c341041b13606ccfaf92674f54480f6d /scripts/combo-layer | |
| parent | 638cd44cc9a9eb435350aac7e8eeec585d74f8db (diff) | |
| download | openembedded-core-ac4ef551d506a5767946cf2fb717c2fd7f86df9c.tar.gz openembedded-core-ac4ef551d506a5767946cf2fb717c2fd7f86df9c.tar.bz2 openembedded-core-ac4ef551d506a5767946cf2fb717c2fd7f86df9c.zip | |
combo-layer: fix AttributeError traceback.
Commit c908a423f85a84ddd8249abd00254f29d47df74b introduced a new
issue in combo-layer that leads to a traceback as
args.hard_reset is an unknown variable. This change defines an
appropriate destination for the command args parser and fixes the
reference.
Signed-off-by: Alexander Kanevskiy <kad@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 6b0c56d37e..70dad83217 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -587,7 +587,7 @@ def action_pull(conf, args): branch = repo.get('branch', "master") runcmd("git checkout %s" % branch, ldir) logger.info("update component repo %s in %s ..." % (name, ldir)) - if not args.hard_reset: + if not conf.hard_reset: output=runcmd("git pull --ff-only", ldir) logger.info(output) else: @@ -902,7 +902,7 @@ Action: parser.add_option("--hard-reset", help = "instead of pull do fetch and hard-reset in component repos", - action = "store_true", default = False) + action = "store_true", dest = "hard_reset", default = False) parser.add_option("-H", "--history", help = "import full history of components during init", action = "store_true", default = False) |