From 28619cd767c281af7ce543925d4212d843a09de8 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 15 Aug 2016 11:30:44 +0200 Subject: [PATCH] Enhance mark_spam.py script * mark_spam.py: Add error handling and reset another properties of attachments and bugs. From-SVN: r239467 --- contrib/ChangeLog | 5 +++++ contrib/mark_spam.py | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 6e1a0fc2d7b..16ea455b2cf 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2016-08-15 Martin Liska + + * mark_spam.py: Add error handling and reset + another properties of attachments and bugs. + 2016-08-11 Martin Liska * mark_spam.py: Mark attachments as obsolete and rename them. diff --git a/contrib/mark_spam.py b/contrib/mark_spam.py index 569a03dd9a7..f206356ba6e 100755 --- a/contrib/mark_spam.py +++ b/contrib/mark_spam.py @@ -34,6 +34,10 @@ def mark_as_spam(id, api_key, verbose): r = requests.get(u) response = json.loads(r.text) + if 'error' in response and response['error']: + print(response['message']) + return + # 2) mark the bug as spam cc_list = response['bugs'][0]['cc'] data = { @@ -49,6 +53,7 @@ def mark_as_spam(id, api_key, verbose): 'cc': {'remove': cc_list}, 'priority': 'P5', 'severity': 'trivial', + 'url': '', 'assigned_to': 'unassigned@gcc.gnu.org' } r = requests.put(u, json = data) @@ -74,7 +79,12 @@ def mark_as_spam(id, api_key, verbose): for a in attachments: attachment_id = a['id'] url = '%sbug/attachment/%d' % (base_url, attachment_id) - r = requests.put(url, json = {'ids': [attachment_id], 'summary': 'spam', 'comment': 'spam', 'is_obsolete': True, 'api_key': api_key}) + r = requests.put(url, json = {'ids': [attachment_id], + 'summary': 'spam', + 'file_name': 'spam', + 'content_type': 'application/x-spam', + 'is_obsolete': True, + 'api_key': api_key}) if verbose: print(r) print(r.text) -- 2.30.2