[oe-commits] Richard Purdie : scripts/combo-layer: Handle update with no repo/ revision specified

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 411a6a3694a9fcd563c5b5320597314fbec75cc2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=411a6a3694a9fcd563c5b5320597314fbec75cc2

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Mar 20 16:28:03 2015 +0000

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 at linuxfoundation.org>

---

 scripts/combo-layer | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index cbff618..83cfc8e 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']