From 794bd9bd13fb0a4bf02d0bed3575835e048f96ed Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Sat, 14 Aug 2010 19:57:13 +0200 Subject: [PATCH] update-maintainer: Don't change the Maintainer field if the email is set to a @lists.ubuntu.com address. --- debian/changelog | 4 +++- update-maintainer | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index eabf39f..8407105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,10 @@ ubuntu-dev-tools (0.102) UNRELEASED; urgency=low Spalinger for the patch (LP: #365147). * Update the man page of suspicious-source to match the rewrite. * syncpackage: Don't upload orig tarball if not needed. + * update-maintainer: Don't change the Maintainer field if the email is set + to a @lists.ubuntu.com address. - -- Benjamin Drung Sat, 14 Aug 2010 18:19:53 +0200 + -- Benjamin Drung Sat, 14 Aug 2010 19:55:36 +0200 ubuntu-dev-tools (0.101) unstable; urgency=low diff --git a/update-maintainer b/update-maintainer index 768c00e..37b6789 100755 --- a/update-maintainer +++ b/update-maintainer @@ -75,11 +75,22 @@ maintainer_field = re.findall('(Maintainer:) (.*) (<.*>)', file_contents) maintainer_name = maintainer_field[0][1] maintainer_mail = maintainer_field[0][2] -if maintainer_mail.find("@ubuntu.com") != -1: +if maintainer_mail.endswith("@ubuntu.com>"): if not options.quiet: print "Maintainer email is set to an @ubuntu.com address - doing nothing." sys.exit(0) +# Prior May 2009 these Maintainers were used: +# main or restricted: Ubuntu Core Developers +# universe or multiverse: Ubuntu MOTU Developers +old_maintainer = maintainer_mail in ("", + "") +if maintainer_mail.endswith("@lists.ubuntu.com>") and not old_maintainer: + if not options.quiet: + print "Maintainer email is set to an @lists.ubuntu.com address - doing nothing." + sys.exit(0) + + # Check if Maintainer field is as approved in TB decision. if 'Ubuntu Developers' in maintainer_name and \ '' in maintainer_mail: