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>

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 6b0c56d37e2c189fed12618834042a30282834ba..70dad83217b904b85a9cba6b307a805ce65d55ae 100755 (executable)
--- 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)