summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorAlexander Kanevskiy <kad@linux.intel.com>2015-07-30 19:49:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 12:09:42 +0100
commit405bb5b588548dcfbe98998f947bf8cb03e94e48 (patch)
treea91710aa26b6a9a0ae64d6cf81a646a1b1cfcced /scripts/combo-layer
parent54c92196b8bd98ffe77e96816031d706f7c58341 (diff)
downloadpoky-405bb5b588548dcfbe98998f947bf8cb03e94e48.tar.gz
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>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer4
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):
587 branch = repo.get('branch', "master") 587 branch = repo.get('branch', "master")
588 runcmd("git checkout %s" % branch, ldir) 588 runcmd("git checkout %s" % branch, ldir)
589 logger.info("update component repo %s in %s ..." % (name, ldir)) 589 logger.info("update component repo %s in %s ..." % (name, ldir))
590 if not args.hard_reset: 590 if not conf.hard_reset:
591 output=runcmd("git pull --ff-only", ldir) 591 output=runcmd("git pull --ff-only", ldir)
592 logger.info(output) 592 logger.info(output)
593 else: 593 else:
@@ -902,7 +902,7 @@ Action:
902 902
903 parser.add_option("--hard-reset", 903 parser.add_option("--hard-reset",
904 help = "instead of pull do fetch and hard-reset in component repos", 904 help = "instead of pull do fetch and hard-reset in component repos",
905 action = "store_true", default = False) 905 action = "store_true", dest = "hard_reset", default = False)
906 906
907 parser.add_option("-H", "--history", help = "import full history of components during init", 907 parser.add_option("-H", "--history", help = "import full history of components during init",
908 action = "store_true", default = False) 908 action = "store_true", default = False)