mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-13 08:01:09 +00:00
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:
parent
6fa16dd85e
commit
3a425de23e
@ -61,9 +61,9 @@ def main():
|
|||||||
for merge in json.loads(page):
|
for merge in json.loads(page):
|
||||||
package = merge['source_package']
|
package = merge['source_package']
|
||||||
author, uploader = '', ''
|
author, uploader = '', ''
|
||||||
if 'user' in merge:
|
if 'user' in merge and merge['user'] is not None:
|
||||||
author = merge['user']
|
author = merge['user']
|
||||||
if 'uploader' in merge:
|
if 'uploader' in merge and merge['uploader'] is not None:
|
||||||
uploader = '(%s)' % merge['uploader']
|
uploader = '(%s)' % merge['uploader']
|
||||||
pretty_uploader = ' '.join((author, uploader)).strip()
|
pretty_uploader = ' '.join((author, uploader)).strip()
|
||||||
if (match is None or
|
if (match is None or
|
||||||
|
Loading…
x
Reference in New Issue
Block a user