summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-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)