From 91605159139a311add3182e2a44d597157558ef8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 20 Feb 2014 14:22:33 +0100 Subject: [PATCH] actually test the previous commit in action ;( --- osc-staging.py | 2 +- osclib/stagingapi.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/osc-staging.py b/osc-staging.py index bdc4c429..911fb533 100644 --- a/osc-staging.py +++ b/osc-staging.py @@ -209,7 +209,7 @@ def do_staging(self, subcmd, opts, *args): api.rq_to_prj(rq, stprj) else: api.rm_from_prj(stprj, request_id=rq) - api.add_review(request_id, by_group='factory-staging', + api.add_review(rq, by_group='factory-staging', msg='Please recheck') elif cmd in ['move']: sprj = api.prj_from_letter(args[1]) diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index ecfc2a8f..e390f680 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -630,7 +630,7 @@ class StagingAPI(object): return list - def add_review(self, request_id, by_project=None, by_group=None): + def add_review(self, request_id, by_project=None, by_group=None, msg=None): """ Adds review by project to the request :param request_id: request to add review to @@ -645,16 +645,18 @@ class StagingAPI(object): if by_group and i.by_group == by_group and i.state == 'new': return - query = { 'cmd': 'addreview' } - msg = None + query = {} if by_project: query['by_project'] = by_project - msg='Being evaluated by staging project "{0}"'.format(by_project) + if not msg: + msg = 'Being evaluated by staging project "{0}"'.format(by_project) if by_group: query['by_group'] = by_group - msg='Being evaluated by group "{0}"'.format(by_group) - if not msg: + if not msg: + msg = 'Being evaluated by group "{0}"'.format(by_group) + if len(query) == 0: raise oscerr.WrongArgs("We need a group or a project") + query['cmd'] = 'addreview' url = makeurl(self.apiurl, ['request', str(request_id)], query) http_POST(url, data=msg)