[oe-commits] Paul Eggleton : combo-layer: check that last_revision is valid
git at git.openembedded.org
git at git.openembedded.org
Tue Jul 31 07:05:27 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 05382932257257247b8c18bc06e9c0039d134d06
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=05382932257257247b8c18bc06e9c0039d134d06
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Tue Jul 31 01:06:25 2012 +0100
combo-layer: check that last_revision is valid
If the user edits the configuration file by hand and sets last_revision,
we need to ensure that the revision is valid and on the specified
branch.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/combo-layer | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 40e63b9..95653b0 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -197,6 +197,25 @@ def drop_to_shell(workdir=None):
else:
return True
+def check_rev_branch(repodir, rev, branch):
+ try:
+ actualbranch = runcmd("git branch --contains %s" % rev, repodir, printerr=False).rstrip()
+ except subprocess.CalledProcessError as e:
+ if e.returncode == 129:
+ actualbranch = ""
+ else:
+ raise
+
+ if ' ' in actualbranch:
+ actualbranch = actualbranch.split(' ')[-1]
+ if not actualbranch:
+ logger.error("Specified revision %s is invalid!" % rev)
+ return False
+ elif actualbranch != branch:
+ logger.error("Specified revision %s is not on specified branch %s!" % (rev, branch))
+ return False
+ return True
+
def get_repos(conf, args):
repos = []
if len(args) > 1:
@@ -273,6 +292,8 @@ def action_update(conf, args):
patch_cmd_range = "--root %s" % branch
rev_cmd_range = branch
else:
+ if not check_rev_branch(ldir, repo['last_revision'], branch):
+ sys.exit(1)
patch_cmd_range = "%s..%s" % (repo['last_revision'], branch)
rev_cmd_range = patch_cmd_range
More information about the Openembedded-commits
mailing list