grep-merges: Do not override author or uploader with None

There can be JSON entries which have uploader=None, and such entries would
lead to TypeError when trying to use ' '.join().
This commit is contained in:
Dmitry Shachnev 2016-04-27 13:05:54 +03:00
parent 6fa16dd85e
commit 3a425de23e

View File

@ -61,9 +61,9 @@ def main():
for merge in json.loads(page):
package = merge['source_package']
author, uploader = '', ''
if 'user' in merge:
if 'user' in merge and merge['user'] is not None:
author = merge['user']
if 'uploader' in merge:
if 'uploader' in merge and merge['uploader'] is not None:
uploader = '(%s)' % merge['uploader']
pretty_uploader = ' '.join((author, uploader)).strip()
if (match is None or