aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2016-08-15 11:30:44 +0200
committerMartin Liska <marxin@gcc.gnu.org>2016-08-15 09:30:44 +0000
commit28619cd767c281af7ce543925d4212d843a09de8 (patch)
treeba3bb83814224eee45684a33305eea5aec91a6b1 /contrib
parentf5ea1d3878b0fb6ec80fdcae4468f5980cbea2bb (diff)
downloadgcc-28619cd767c281af7ce543925d4212d843a09de8.zip
gcc-28619cd767c281af7ce543925d4212d843a09de8.tar.gz
gcc-28619cd767c281af7ce543925d4212d843a09de8.tar.bz2
Enhance mark_spam.py script
* mark_spam.py: Add error handling and reset another properties of attachments and bugs. From-SVN: r239467
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog5
-rwxr-xr-xcontrib/mark_spam.py12
2 files changed, 16 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 6e1a0fc..16ea455 100644
--- 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 569a03d..f206356 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)