From d6a19fc638c7a0c74bb3220782ed037034cf94ce Mon Sep 17 00:00:00 2001 From: Jonathan Patrick Davies <jpds@ubuntu.com> Date: Tue, 12 Aug 2008 14:07:51 +0100 Subject: [PATCH] * requestsync: - Print usage before checking for sponsorship. - Restore 're' import to where it was. --- requestsync | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requestsync b/requestsync index dba24dd..3882188 100755 --- a/requestsync +++ b/requestsync @@ -27,7 +27,6 @@ import getopt import os -import re import subprocess import sys import urllib @@ -335,7 +334,8 @@ def edit_report(subject, body, changes_required=False): program exits. Returns (new_subject, new_body). """ - import string + import re + import string report = "Summary (one line):\n%s\n\nDescription:\n%s" % (subject, body) @@ -393,14 +393,14 @@ if __name__ == '__main__': if o == '-n': newsource = True if o == '-k': keyid = a if o == '--lp': use_lp_bugs = True - - sponsorship = checkNeedsSponsorship() if len(args) not in (2, 3): usage() if not use_lp_bugs and not get_email_address(): sys.exit(1) + + sponsorship = checkNeedsSponsorship() (srcpkg, release) = args[:2] force_base_ver = None