sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: ac4ef551d506a5767946cf2fb717c2fd7f86df9c)

Signed-off-by: Alexander Kanevskiy <kad@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanevskiy 2015-07-30 19:49:17 +03:00 committed by Richard Purdie
parent 54c92196b8
commit 405bb5b588
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/combo-layer
View File

@ -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)