Enhance mark_spam.py script

	* mark_spam.py: Add error handling and reset
	another properties of attachments and bugs.

From-SVN: r239467

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 6e1a0fc2d7b1d5ece16853d811572979e2d6312a..16ea455b2cf7390b8a0b3446ee100babb245616a 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-15  Martin Liska  <mliska@suse.cz>
+
+       * mark_spam.py: Add error handling and reset
+       another properties of attachments and bugs.
+
 2016-08-11  Martin Liska  <mliska@suse.cz>
 
        * mark_spam.py: Mark attachments as obsolete and rename them.

diff --git a/contrib/mark_spam.py b/contrib/mark_spam.py
index 569a03dd9a78a361fc72910540bbbe4b5d2839f1..f206356ba6e3c17ecf817e5dbfb226e467903485 100755 (executable)
--- 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)