summaryrefslogtreecommitdiff
path: root/scripts/combo-layer
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:55:17 +0000
commit411a6a3694a9fcd563c5b5320597314fbec75cc2 (patch)
tree07b091e36df9e576791cbbbed005cb741b7f6e08 /scripts/combo-layer
parentdeb06c96dccdbc6da0f301653e9781ce2fe8173d (diff)
downloadopenembedded-core-411a6a3694a9fcd563c5b5320597314fbec75cc2.tar.gz
openembedded-core-411a6a3694a9fcd563c5b5320597314fbec75cc2.tar.bz2
openembedded-core-411a6a3694a9fcd563c5b5320597314fbec75cc2.zip
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 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-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):
apply the generated patches
"""
components = [arg.split(':')[0] for arg in args[1:]]
- revisions = []
+ revisions = {}
for arg in args[1:]:
- revision= arg.split(':', 1)[1] if ':' in arg else None
- revisions.append(revision)
- # Map commitishes to repos
- repos = OrderedDict(zip(get_repos(conf, components), revisions))
+ if ':' in arg:
+ a = arg.split(':', 1)
+ revisions[a[0]] = a[1]
+ repos = get_repos(conf, components)
# make sure combo repo is clean
check_repo_clean(os.getcwd())
@@ -592,7 +592,8 @@ def action_update(conf, args):
else:
action_pull(conf, ['arg0'] + components)
- for name, revision in repos.iteritems():
+ for name in repos:
+ revision = revisions.get(name, None)
repo = conf.repos[name]
ldir = repo['local_repo_dir']
dest_dir = repo['dest_dir']