mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-28 10:46:15 +01:00
Code

- use new api call to collect all project wide source services

Browse Source
This commit is contained in:
Adrian Schröter 2011-02-15 18:39:06 +01:00
parent f0690d4e2f
commit 5d84695beb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/core.py
View File

@ -240,11 +240,11 @@ class Serviceinfo:
msg = 'invalid service format:\n%s' % ET.tostring(serviceinfo_node) msg = 'invalid service format:\n%s' % ET.tostring(serviceinfo_node)
raise oscerr.APIError(msg) raise oscerr.APIError(msg)
def readProjectFile(self, apiurl, project): def getProjectGlobalServices(self, apiurl, project, package):
# download project wide _service file, we don't store it yet # get all project wide services in one file, we don't store it yet
u = makeurl(apiurl, ['source', project, "_project", "_service"]) u = makeurl(apiurl, ['source', project, package], query='cmd=getprojectservices')
try: try:
f = http_GET(u) f = http_POST(u)
root = ET.parse(f).getroot() root = ET.parse(f).getroot()
self.read(root, True) self.read(root, True)
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
@ -2030,7 +2030,7 @@ rev: %s
if self.filenamelist.count('_service') or self.filenamelist_unvers.count('_service'): if self.filenamelist.count('_service') or self.filenamelist_unvers.count('_service'):
service = ET.parse(os.path.join(self.absdir, '_service')).getroot() service = ET.parse(os.path.join(self.absdir, '_service')).getroot()
si.read(service) si.read(service)
si.readProjectFile(self.apiurl, self.prjname) si.getProjectGlobalServices(self.apiurl, self.prjname, self.name)
si.execute(self.absdir, mode, singleservice) si.execute(self.absdir, mode, singleservice)
os.chdir(curdir) os.chdir(curdir)