Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
There can be JSON entries which have uploader=None.
This commit is contained in:
Martin Pitt 2016-05-13 09:04:55 +02:00
commit 4d07f85874
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
ubuntu-dev-tools (0.158) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* grep-merges: Do not override author or uploader with None
There can be JSON entries which have uploader=None.
-- Martin Pitt <martin.pitt@ubuntu.com> Fri, 13 May 2016 09:04:03 +0200
ubuntu-dev-tools (0.157) unstable; urgency=medium ubuntu-dev-tools (0.157) unstable; urgency=medium
* mk-sbuild: cp localtime and timezone a little harder (LP: #1569400) * mk-sbuild: cp localtime and timezone a little harder (LP: #1569400)

4
grep-merges
View File

@ -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 merge.get('user'):
author = merge['user'] author = merge['user']
if 'uploader' in merge: if merge.get('uploader'):
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