diff --git a/debian/changelog b/debian/changelog index 5ceffda..48c8393 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ ubuntu-dev-tools (0.167) UNRELEASED; urgency=medium + [ Colin Watson ] * syncpackage: + Support wildcards in sync-blacklist (LP: #1807992). + [ Steve Langasek ] + * grep-merges: + + support grepping by team name (full name match) now that MoM exposes + this + -- Colin Watson Tue, 11 Dec 2018 16:39:00 +0000 ubuntu-dev-tools (0.166) unstable; urgency=medium diff --git a/grep-merges b/grep-merges index 0a4b19b..aaff1e1 100755 --- a/grep-merges +++ b/grep-merges @@ -66,8 +66,13 @@ def main(): author = merge['user'] if merge.get('uploader'): uploader = '(%s)' % merge['uploader'] + try: + teams = merge['teams'] + except: + teams = [] + pretty_uploader = u'{} {}'.format(author, uploader) - if match is None or match in package or match in author or match in uploader: + if match is None or match in package or match in author or match in uploader or match in teams: print '%s\t%s' % (package.encode("utf-8"), pretty_uploader.encode("utf-8"))