From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Cc: "markus.Lehtonen" <markus.Lehtonen@intel.com>
Subject: [PATCH] scripts/combo-layer: Handle update with no repo/revision specified
Date: Fri, 20 Mar 2015 16:28:03 +0000 [thread overview]
Message-ID: <1426868883.29168.78.camel@linuxfoundation.org> (raw)
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>
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']
reply other threads:[~2015-03-20 16:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426868883.29168.78.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=markus.Lehtonen@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox