From 43b5feb087a95fe2f12dc4e40a514eed619e3b24 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Wed, 9 Jun 2010 23:55:16 +0200 Subject: [PATCH] update-maintainer: Avoid duplicate Original-Maintainer field if maintainer is listed in Uploaders too. --- debian/changelog | 11 +++++++---- update-maintainer | 7 ++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index c326f45..5a9d70c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,9 +16,12 @@ ubuntu-dev-tools (0.100) UNRELEASED; urgency=low [ Benjamin Drung ] * 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. + - add more options and allow pulling packages from Debian. + - add mismatching source tarball detection (for fake syncs). + * 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 Tue, 08 Jun 2010 19:08:24 +0200 + -- Benjamin Drung Wed, 09 Jun 2010 23:53:13 +0200 ubuntu-dev-tools (0.99) lucid; urgency=low diff --git a/update-maintainer b/update-maintainer index c806ba5..2afe4c8 100755 --- a/update-maintainer +++ b/update-maintainer @@ -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()