From: James Troup Date: Fri, 21 Feb 2003 19:20:00 +0000 (+0000) Subject: tbm's simplification of fix_maintainer. add include_blank_lines optional arg to... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c6467a180f457b80b8afeefec27f4a7347ff8a;p=dak tbm's simplification of fix_maintainer. add include_blank_lines optional arg to prefix_multi_line_string. --- diff --git a/utils.py b/utils.py index e1b5ab34..1be0b7e0 100644 --- a/utils.py +++ b/utils.py @@ -2,7 +2,7 @@ # Utility functions # Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $Id: utils.py,v 1.55 2003-02-07 14:53:42 troup Exp $ +# $Id: utils.py,v 1.56 2003-02-21 19:20:00 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -250,7 +250,7 @@ def build_file_list(changes, is_a_dsc=0): ###################################################################################### # Fix the `Maintainer:' field to be an RFC822 compatible address. -# cf. Packaging Manual (4.2.4) +# cf. Debian Policy Manual (D.2.4) # # 06:28| 'The standard sucks, but my tool is supposed to # interoperate with it. I know - I'll fix the suckage @@ -258,14 +258,14 @@ def build_file_list(changes, is_a_dsc=0): def fix_maintainer (maintainer): m = re_parse_maintainer.match(maintainer); - rfc822 = maintainer - name = "" - email = "" + rfc822 = maintainer; + name = ""; + email = ""; if m != None and len(m.groups()) == 2: - name = m.group(1) - email = m.group(2) + name = m.group(1); + email = m.group(2); if name.find(',') != -1 or name.find('.') != -1: - rfc822 = re_parse_maintainer.sub(r"\2 (\1)", maintainer) + rfc822 = "%s (%s)" % (email, name); return (rfc822, name, email) ###################################################################################### @@ -499,11 +499,11 @@ def result_join (original, sep = '\t'): ################################################################################ -def prefix_multi_line_string(str, prefix): +def prefix_multi_line_string(str, prefix, include_blank_lines=0): out = ""; for line in str.split('\n'): line = line.strip(); - if line: + if line or include_blank_lines: out += "%s%s\n" % (prefix, line); # Strip trailing new line if out: