From 9b722d61f4157a81c38138c58daaecafc3471062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 7 Aug 2009 07:32:10 +0000 Subject: [PATCH] reqeuest list -s X,Y was broken, a state can have only one value. And there is no personality splitting in OBS either ;) --- NEWS | 1 + osc/core.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d0a79dcc..7b35ceb8 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ - new osc rremove command for remote source files removal - handle _service\* files correctly - osc commit asks if some file has a '?' status (can be skipped by --force option) + - fixed request list for multiple states 0.120: - support "setlinkrev" for whole projects diff --git a/osc/core.py b/osc/core.py index 190aac1c..0aa229e3 100755 --- a/osc/core.py +++ b/osc/core.py @@ -2301,10 +2301,10 @@ def get_request_list(apiurl, project, package, req_who='', req_state=('new',), r matches = [] match='' for state in req_state: - if len(match): match += '%20and%20' + if len(match): match += '%20or%20' match += 'state/@name=\'%s\'' % quote_plus(state) if req_who: - if len(match): match += '%20and%20' + if len(match): match += '%20or%20' match += 'state/@who=\'%s\'' % quote_plus(req_who) # XXX: we cannot use the '|' in the xpath expression because it is not supported