mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-10 13:05:46 +01:00
Code

- fixed #671790 ("osc my rq returns 400")

Browse Source
This commit is contained in:
Marcus Huewe 2011-02-24 14:06:15 +01:00
parent 87d95409ec
commit 0ee18d1d7e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/core.py
View File

@ -3667,7 +3667,7 @@ def get_user_projpkgs_request_list(apiurl, user, req_state=('new','review',), re
xp = '' xp = ''
for state in req_state: for state in req_state:
xp = xpath_join(xp, 'state/@name=\'%s\'' % state, inner=True) xp = xpath_join(xp, 'state/@name=\'%s\'' % state, inner=True)
xpath = xpath_join(xp, '(%s)' % xpath, op='and') xpath = xpath_join(xp, xpath, op='and', nexpr_parentheses=True)
res = search(apiurl, request=xpath) res = search(apiurl, request=xpath)
result = [] result = []
for root in res['request'].findall('request'): for root in res['request'].findall('request'):
@ -5358,11 +5358,12 @@ def build_table(col_num, data = [], headline = [], width=1, csv = False):
separator = '' separator = ''
return [separator.join(row) for row in table] return [separator.join(row) for row in table]
def xpath_join(expr, new_expr, op='or', inner=False): def xpath_join(expr, new_expr, op='or', inner=False, nexpr_parentheses=False):
""" """
Join two xpath expressions. If inner is False expr will Join two xpath expressions. If inner is False expr will
be surrounded with parentheses (unless it's not already be surrounded with parentheses (unless it's not already
surrounded). surrounded). If nexpr_parentheses is True new_expr will be
surrounded with parentheses.
""" """
if not expr: if not expr:
return new_expr return new_expr
@ -5391,6 +5392,8 @@ def xpath_join(expr, new_expr, op='or', inner=False):
break break
if parentheses: if parentheses:
expr = '(%s)' % expr expr = '(%s)' % expr
if nexpr_parentheses:
new_expr = '(%s)' % new_expr
return '%s %s %s' % (expr, op, new_expr) return '%s %s %s' % (expr, op, new_expr)
def search(apiurl, **kwargs): def search(apiurl, **kwargs):