* requestsync:

- Print usage before checking for sponsorship.
  - Restore 're' import to where it was.
This commit is contained in:
Jonathan Patrick Davies 2008-08-12 14:07:51 +01:00
parent 05c55bfbe2
commit d6a19fc638

View File

@ -27,7 +27,6 @@
import getopt import getopt
import os import os
import re
import subprocess import subprocess
import sys import sys
import urllib import urllib
@ -335,7 +334,8 @@ def edit_report(subject, body, changes_required=False):
program exits. program exits.
Returns (new_subject, new_body). Returns (new_subject, new_body).
""" """
import string import re
import string
report = "Summary (one line):\n%s\n\nDescription:\n%s" % (subject, body) 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 == '-n': newsource = True
if o == '-k': keyid = a if o == '-k': keyid = a
if o == '--lp': use_lp_bugs = True if o == '--lp': use_lp_bugs = True
sponsorship = checkNeedsSponsorship()
if len(args) not in (2, 3): if len(args) not in (2, 3):
usage() usage()
if not use_lp_bugs and not get_email_address(): if not use_lp_bugs and not get_email_address():
sys.exit(1) sys.exit(1)
sponsorship = checkNeedsSponsorship()
(srcpkg, release) = args[:2] (srcpkg, release) = args[:2]
force_base_ver = None force_base_ver = None