zuul/zuul
Code Issues Proposed changes

Fix getInfoRefs call from getProjectBranches

Browse Source 
From other parts of the code getInfoRefs is always called via the
project name instead of the project object.

Further make it explicit in getInfoRefs and getRefSha that they
require a project name and not a project.

Change-Id: I7bad770e03416612a7c9ece5f368bd894156bd16
This commit is contained in:
Tobias Henkel 2017-02-22 08:10:26 +01:00
parent 5337c84b04
commit 0ce99d793f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zuul/driver/gerrit/gerritconnection.py
View File

@ -513,10 +513,10 @@ class GerritConnection(BaseConnection):
time.sleep(self.replication_retry_interval)
return False
def getRefSha(self, project, ref):
def getRefSha(self, project_name, ref):
refs = {}
try:
refs = self.getInfoRefs(project)
refs = self.getInfoRefs(project_name)
except:
self.log.exception("Exception looking for ref %s" %
ref)
@ -578,7 +578,7 @@ class GerritConnection(BaseConnection):
return changes
def getProjectBranches(self, project):
refs = self.getInfoRefs(project)
refs = self.getInfoRefs(project.name)
heads = [str(k[len('refs/heads/'):]) for k in refs.keys()
if k.startswith('refs/heads/')]
return heads
@ -710,9 +710,9 @@ class GerritConnection(BaseConnection):
raise Exception("Gerrit error executing %s" % command)
return (out, err)
def getInfoRefs(self, project):
def getInfoRefs(self, project_name):
url = "%s/p/%s/info/refs?service=git-upload-pack" % (
self.baseurl, project)
self.baseurl, project_name)
try:
data = urllib.request.urlopen(url).read()
except: