From 7e8423a470d7a48300139036751fa9e96ca8f278 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Fri, 26 Nov 2010 14:38:31 +0100 Subject: [PATCH] sponsor-patch: Move workdir logic before option parser. --- sponsor-patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sponsor-patch b/sponsor-patch index 77a66e5..679412a 100755 --- a/sponsor-patch +++ b/sponsor-patch @@ -444,11 +444,6 @@ def apply_patch(task, patch): def main(script_name, bug_number, build, edit, keyid, upload, workdir, verbose=False): - if not workdir: - if "SPONSOR_PATCH_WORKDIR" in os.environ: - workdir = os.path.abspath(os.environ["SPONSOR_PATCH_WORKDIR"]) - else: - workdir = os.getcwd() workdir = os.path.expanduser(workdir) if not os.path.isdir(workdir): try: @@ -725,6 +720,11 @@ if __name__ == "__main__": epilog = "See %s(1) for more info." % (script_name) parser = optparse.OptionParser(usage=usage, epilog=epilog) + if "SPONSOR_PATCH_WORKDIR" in os.environ: + default_workdir = os.path.abspath(os.environ["SPONSOR_PATCH_WORKDIR"]) + else: + default_workdir = os.getcwd() + parser.add_option("-b", "--build", help="Build the package with pbuilder.", dest="build", action="store_true", default=False) parser.add_option("-e", "--edit", @@ -738,7 +738,8 @@ if __name__ == "__main__": help="Specify an upload destination (default none).") parser.add_option("-v", "--verbose", help="print more information", dest="verbose", action="store_true", default=False) - parser.add_option("-w", "--workdir", dest="workdir", default=None, + parser.add_option("-w", "--workdir", dest="workdir", + default=default_workdir, help="Specify a working directory.") (options, args) = parser.parse_args()