mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-26 04:02:11 +01:00
Code

submitreq: adjust to renamed API calls and XML ("merge" -> "submit")

Browse Source
This commit is contained in:
Dr. Peter Poeml 2008-03-20 19:17:40 +00:00
parent 303e5dcffc
commit c2c406aab2
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osc/core.py
View File

@ -1048,15 +1048,13 @@ class SubmitReq:
def read(self, root): def read(self, root):
self.reqid = root.get('id') self.reqid = root.get('id')
# FIXME: the xml is not yet adjusted, 'submit' is still called 'merge' n = root.find('submit').find('source')
n = root.find('merge').find('source')
self.src_project = n.get('project') self.src_project = n.get('project')
self.src_package = n.get('package') self.src_package = n.get('package')
try: self.src_md5 = n.get('rev') try: self.src_md5 = n.get('rev')
except: pass except: pass
# FIXME: the xml is not yet adjusted, 'submit' is still called 'merge' n = root.find('submit').find('target')
n = root.find('merge').find('target')
self.dst_project = n.get('project') self.dst_project = n.get('project')
self.dst_package = n.get('package') self.dst_package = n.get('package')
@ -1757,13 +1755,12 @@ def create_submit_request(apiurl,
r.dst_package = dst_package r.dst_package = dst_package
r.descr = cgi.escape(message or '') r.descr = cgi.escape(message or '')
# FIXME: merge is still called merge
xml = """\ xml = """\
<request type="merge"> <request type="submit">
<merge> <submit>
<source project="%s" package="%s" rev="%s"/> <source project="%s" package="%s" rev="%s"/>
<target project="%s" package="%s" /> <target project="%s" package="%s" />
</merge> </submit>
<state name="new"/> <state name="new"/>
<description>%s</description> <description>%s</description>
</request> </request>
@ -1800,10 +1797,9 @@ def change_submit_request_state(apiurl, reqid, newstate, message=''):
def get_submit_request_list(apiurl, project, package): def get_submit_request_list(apiurl, project, package):
# FIXME: the api path is not yet renamed, still called "merge" match = 'submit/target/@project=\'%s\'' % quote_plus(project)
match = 'merge/target/@project=\'%s\'' % quote_plus(project)
if package: if package:
match += '%20and%20' + 'merge/target/@package=\'%s\'' % quote_plus(package) match += '%20and%20' + 'submit/target/@package=\'%s\'' % quote_plus(package)
u = makeurl(apiurl, ['search', 'request'], ['match=%s' % match]) u = makeurl(apiurl, ['search', 'request'], ['match=%s' % match])
f = http_GET(u) f = http_GET(u)