update-maintainer: Remove duplicate Original-Maintainer field.

This commit is contained in:
Benjamin Drung 2010-06-03 21:36:02 +02:00
parent ea28be8a95
commit 34c6d5a238
2 changed files with 10 additions and 2 deletions

5
debian/changelog vendored
View File

@ -18,12 +18,13 @@ ubuntu-dev-tools (0.100) UNRELEASED; urgency=low
* syncpackage: * syncpackage:
- add more options and allow pulling packages from Debian. - add more options and allow pulling packages from Debian.
- add mismatching source tarball detection (for fake syncs). - add mismatching source tarball detection (for fake syncs).
* update-maintainer: Remove duplicate Original-Maintainer field.
[ Michael Vogt ] [ Michael Vogt ]
* edit-patch: * edit-patch:
- support full path to the patch as well (LP: #585599) - support full path to the patch as well (LP: #585599)
-- Benjamin Drung <bdrung@ubuntu.com> Sat, 15 May 2010 17:55:22 +0200 -- Benjamin Drung <bdrung@ubuntu.com> Thu, 03 Jun 2010 21:32:01 +0200
ubuntu-dev-tools (0.99) lucid; urgency=low ubuntu-dev-tools (0.99) lucid; urgency=low

View File

@ -95,6 +95,13 @@ original_maintainer = maintainer_name + " " + maintainer_mail
# XSBC-Original maintainer field # XSBC-Original maintainer field
if not "lists.ubuntu.com" in original_maintainer: if not "lists.ubuntu.com" in original_maintainer:
# Remove existing Original-Maintainer field
# to avoid multiple Original-Maintainer fields
original_maintainer_fields = re.findall('(.*Original-Maintainer): (.*)', file_contents)
if len(original_maintainer_fields) > 0:
for original_maintainer_field in original_maintainer_fields:
print "Removing existing %s: %s" % original_maintainer_field
file_contents = re.sub('.*Original-Maintainer: .*\n', "", file_contents)
final_addition = target_maintainer + "\nXSBC-Original-Maintainer: " + original_maintainer final_addition = target_maintainer + "\nXSBC-Original-Maintainer: " + original_maintainer
else: else:
final_addition = target_maintainer final_addition = target_maintainer