fix validation of stable branches for independent deliverables

The wrong variable was being used to check for the existing
branch. Add some debug messages to show what we do find and fix that
variable so the right branch name is checked.

Change-Id: I758f6aa3fd0b983af1b83a922b40c3181ae48014
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2018-08-29 16:50:04 -04:00
parent 3ed613ea9f
commit e5e9c33a16
2 changed files with 3 additions and 1 deletions

View File

@ -1404,7 +1404,7 @@ def validate_stable_branches(deliv, context):
gitutils.stable_branch_exists(
context.workdir,
repo,
deliv.series
series,
)
for repo in deliv.known_repo_names
)

View File

@ -165,6 +165,8 @@ def stable_branch_exists(workdir, repo, series):
cwd=os.path.join(workdir, repo),
).decode('utf-8')
)
LOG.debug('looking for %s', remote_match)
LOG.debug('found branches: %s', containing_branches)
return (remote_match in containing_branches)
except processutils.CalledProcessError as e:
LOG.error('failed checking for branch: %s [%s]', e, e.output.strip())