From c176a4c95e67e2b05368c6aa74c072244d7c8d9f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 8 Mar 2018 10:29:14 +0100 Subject: [PATCH] ReviewBot: allow both group and user review --- ReviewBot.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ReviewBot.py b/ReviewBot.py index a2a2962d..b8e59ddc 100644 --- a/ReviewBot.py +++ b/ReviewBot.py @@ -427,10 +427,11 @@ class ReviewBot(object): return False def set_request_ids_search_review(self): + review = None if self.review_user: review = "@by_user='%s' and @state='new'" % self.review_user - else: - review = "@by_group='%s' and @state='new'" % self.review_group + if self.review_group: + review = osc.core.xpath_join(review, "@by_group='%s' and @state='new'" % self.review_group) url = osc.core.makeurl(self.apiurl, ('search', 'request'), { 'match': "state/@name='review' and review[%s]" % review, 'withfullhistory': 1 } ) root = ET.parse(osc.core.http_GET(url)).getroot()