[oe-commits] Alexander Kanevskiy : combo-layer: fix AttributeError traceback.
git at git.openembedded.org
git at git.openembedded.org
Fri Jul 31 14:40:35 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: ac4ef551d506a5767946cf2fb717c2fd7f86df9c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ac4ef551d506a5767946cf2fb717c2fd7f86df9c
Author: Alexander Kanevskiy <kad at linux.intel.com>
Date: Thu Jul 30 19:49:17 2015 +0300
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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/combo-layer | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 6b0c56d..70dad83 100755
--- 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)
More information about the Openembedded-commits
mailing list