update-maintainer: Avoid duplicate Original-Maintainer field if maintainer is listed in Uploaders too.

This commit is contained in:
Benjamin Drung 2010-06-09 23:55:16 +02:00
parent e7633f6879
commit 43b5feb087
2 changed files with 11 additions and 7 deletions

7
debian/changelog vendored
View File

@ -18,7 +18,10 @@ ubuntu-dev-tools (0.100) UNRELEASED; urgency=low
* syncpackage:
- add more options and allow pulling packages from Debian.
- add mismatching source tarball detection (for fake syncs).
* update-maintainer: Remove duplicate Original-Maintainer field.
* update-maintainer:
- Remove duplicate Original-Maintainer field.
- Avoid duplicate Original-Maintainer field if maintainer is listed in
Uploaders too.
[ Michael Vogt ]
* edit-patch:
@ -32,7 +35,7 @@ ubuntu-dev-tools (0.100) UNRELEASED; urgency=low
- Replace imports of debian_bundle with debian to fix the deprecation
warnings.
-- Michael Bienia <geser@ubuntu.com> Tue, 08 Jun 2010 19:08:24 +0200
-- Benjamin Drung <bdrung@ubuntu.com> Wed, 09 Jun 2010 23:53:13 +0200
ubuntu-dev-tools (0.99) lucid; urgency=low

View File

@ -107,14 +107,15 @@ if not "lists.ubuntu.com" in original_maintainer:
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 = "Maintainer: " + target_maintainer + "\nXSBC-Original-Maintainer: " + original_maintainer
else:
final_addition = target_maintainer
final_addition = "Maintainer: " + target_maintainer
print "The original maintainer for this package is: " + original_maintainer
print "Resetting as: " + target_maintainer
# Replace text.
debian_control_file = open(control_file, "w")
debian_control_file.write(re.sub(re.escape(original_maintainer), final_addition, file_contents))
original_maintainer_line = "Maintainer: " + original_maintainer
debian_control_file.write(re.sub(re.escape(original_maintainer_line), final_addition, file_contents))
debian_control_file.close()