summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 16:28:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 23:56:06 +0000
commitc5e9654ac908537ad0b14e0804be312e7c6f5be8 (patch)
tree09ddff6695c4c5c807fdf3f59cea49c5ffa71cc1
parentdb4f1420ce8a4e61ec4e8f69f4772b0df3a9673a (diff)
downloadpoky-c5e9654ac908537ad0b14e0804be312e7c6f5be8.tar.gz
scripts/combo-layer: Handle update with no repo/revision specified
Running an update operation with no repo/revision specified was failing. This fixes that code path which worked until the change from: http://git.yoctoproject.org/cgit.cgi/poky/commit/scripts/combo-layer?id=3592507a149b668c0a925e176535f7f2002fa543 (From OE-Core rev: 411a6a3694a9fcd563c5b5320597314fbec75cc2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer13
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index cbff61803b..83cfc8e16a 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -571,12 +571,12 @@ def action_update(conf, args):
571 apply the generated patches 571 apply the generated patches
572 """ 572 """
573 components = [arg.split(':')[0] for arg in args[1:]] 573 components = [arg.split(':')[0] for arg in args[1:]]
574 revisions = [] 574 revisions = {}
575 for arg in args[1:]: 575 for arg in args[1:]:
576 revision= arg.split(':', 1)[1] if ':' in arg else None 576 if ':' in arg:
577 revisions.append(revision) 577 a = arg.split(':', 1)
578 # Map commitishes to repos 578 revisions[a[0]] = a[1]
579 repos = OrderedDict(zip(get_repos(conf, components), revisions)) 579 repos = get_repos(conf, components)
580 580
581 # make sure combo repo is clean 581 # make sure combo repo is clean
582 check_repo_clean(os.getcwd()) 582 check_repo_clean(os.getcwd())
@@ -592,7 +592,8 @@ def action_update(conf, args):
592 else: 592 else:
593 action_pull(conf, ['arg0'] + components) 593 action_pull(conf, ['arg0'] + components)
594 594
595 for name, revision in repos.iteritems(): 595 for name in repos:
596 revision = revisions.get(name, None)
596 repo = conf.repos[name] 597 repo = conf.repos[name]
597 ldir = repo['local_repo_dir'] 598 ldir = repo['local_repo_dir']
598 dest_dir = repo['dest_dir'] 599 dest_dir = repo['dest_dir']