[oe-commits] Richard Purdie : scipts/combo-layer: Fix check_rev_branch() for cases where the revision is on more than one branch
git at git.openembedded.org
git at git.openembedded.org
Thu Oct 11 13:17:38 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: f24eff5dd5a76db38d7f68a5052d6e0e56b3a5aa
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f24eff5dd5a76db38d7f68a5052d6e0e56b3a5aa
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Thu Oct 11 12:05:35 2012 +0100
scipts/combo-layer: Fix check_rev_branch() for cases where the revision is on more than one branch
If a revision is in more than one branch, the check_rev_branch() function can't
cope with it and the tool returns incorrect errror messages. This patch
ensures it copes with this situation.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/combo-layer | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 3baea24..ae97471 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -283,19 +283,23 @@ def drop_to_shell(workdir=None):
def check_rev_branch(component, repodir, rev, branch):
try:
- actualbranch = runcmd("git branch --contains %s" % rev, repodir, printerr=False).rstrip()
+ actualbranch = runcmd("git branch --contains %s" % rev, repodir, printerr=False)
except subprocess.CalledProcessError as e:
if e.returncode == 129:
actualbranch = ""
else:
raise
- if ' ' in actualbranch:
- actualbranch = actualbranch.split(' ')[-1]
if not actualbranch:
logger.error("%s: specified revision %s is invalid!" % (component, rev))
return False
- elif actualbranch != branch:
+
+ branches = []
+ branchlist = actualbranch.split("\n")
+ for b in branchlist:
+ branches.append(b.strip().split(' ')[-1])
+
+ if branch not in branches:
logger.error("%s: specified revision %s is not on specified branch %s!" % (component, rev, branch))
return False
return True
More information about the Openembedded-commits
mailing list