From 2a9af55b8dbbacc90586ce1dfb1fde7db46a4f0e Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 22 Aug 2017 10:52:30 -0400 Subject: [PATCH] remove unused master argument from check_branch_sha() Change-Id: Id52d104cebcc33bb817520af7dbc2685ea962d07 Signed-off-by: Doug Hellmann --- openstack_releases/cmds/validate.py | 1 - openstack_releases/gitutils.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/openstack_releases/cmds/validate.py b/openstack_releases/cmds/validate.py index de50b71ffe..ae41c18f0a 100644 --- a/openstack_releases/cmds/validate.py +++ b/openstack_releases/cmds/validate.py @@ -497,7 +497,6 @@ def validate_releases(deliverable_info, zuul_layout, if not gitutils.check_branch_sha(workdir, project['repo'], series_name, - defaults.RELEASE, project['hash']): msg = '%s %s not present in %s branch' % ( project['repo'], diff --git a/openstack_releases/gitutils.py b/openstack_releases/gitutils.py index 365deda63d..86f6bc4b9f 100644 --- a/openstack_releases/gitutils.py +++ b/openstack_releases/gitutils.py @@ -136,7 +136,7 @@ def stable_branch_exists(workdir, repo, series): return False -def check_branch_sha(workdir, repo, series, master, sha): +def check_branch_sha(workdir, repo, series, sha): """Check if the SHA is in the targeted branch. The SHA must appear on a stable/$series branch (if it exists) or