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. (From OE-Core rev: 05382932257257247b8c18bc06e9c0039d134d06) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8140c5b7ee
commit
6bea863704
|
@ -197,6 +197,25 @@ def drop_to_shell(workdir=None):
|
||||||
else:
|
else:
|
||||||
return True
|
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):
|
def get_repos(conf, args):
|
||||||
repos = []
|
repos = []
|
||||||
if len(args) > 1:
|
if len(args) > 1:
|
||||||
|
@ -273,6 +292,8 @@ def action_update(conf, args):
|
||||||
patch_cmd_range = "--root %s" % branch
|
patch_cmd_range = "--root %s" % branch
|
||||||
rev_cmd_range = branch
|
rev_cmd_range = branch
|
||||||
else:
|
else:
|
||||||
|
if not check_rev_branch(ldir, repo['last_revision'], branch):
|
||||||
|
sys.exit(1)
|
||||||
patch_cmd_range = "%s..%s" % (repo['last_revision'], branch)
|
patch_cmd_range = "%s..%s" % (repo['last_revision'], branch)
|
||||||
rev_cmd_range = patch_cmd_range
|
rev_cmd_range = patch_cmd_range
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue