combo-layer: fix AttributeError traceback.

Commit c908a42 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 <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
js333031 · Jul 31, 2015 · ac4ef55 · ac4ef55
1 parent 638cd44
commit ac4ef55
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)