Merge pull request #220 from openSUSE/coolo_urls_2

Coolo urls 2
This commit is contained in:
Alberto Planas 2014-08-25 12:47:38 +02:00
commit 2a842e7385
5 changed files with 4 additions and 3 deletions

View File

@ -107,9 +107,10 @@ class CheckCommand(object):
report = []
if project:
url = self.api.makeurl(('factory', 'staging_projects', project + '.json'))
url = self.api.makeurl(('project', 'staging_projects', 'openSUSE:%s' % self.api.opensuse,
project + '.json'))
else:
url = self.api.makeurl(('factory', 'staging_projects.json'))
url = self.api.makeurl(('project', 'staging_projects', 'openSUSE:%s.json' % self.api.opensuse))
info = json.load(self.api.retried_GET(url))
if not project:
for prj in info:

View File

@ -527,7 +527,7 @@ class StagingAPI(object):
_prefix = 'openSUSE:{}:Staging:'.format(self.opensuse)
if project.startswith(_prefix):
project = project.replace(_prefix, '')
url = self.makeurl(('factory', 'staging_projects', project + '.json'))
url = self.makeurl(('project', 'staging_projects', 'openSUSE:%s' % self.opensuse, project + '.json'))
result = json.load(self.retried_GET(url))
return result['overall_state'] == 'acceptable'