Fix the import --url command

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 7a806cce60fd7382848953db6b432fcf7e307100..8067beb11adfaf0ebec52aa5c097eac08b2e8f25 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -267,7 +267,7 @@ def __import_url(url, options):
     import tempfile
 
     if not url:
     import tempfile
 
     if not url:

-        parser.error('URL argument required')
+        raise CmdException('URL argument required')

 
     patch = os.path.basename(urllib.unquote(url))
     filename = os.path.join(tempfile.gettempdir(), patch)
 
     patch = os.path.basename(urllib.unquote(url))
     filename = os.path.join(tempfile.gettempdir(), patch)


@@ -327,7 +327,7 @@ def func(parser, options, args):
     else:
         filename = None
 
     else:
         filename = None
 

-    if filename:
+    if not options.url and filename:

         filename = os.path.abspath(filename)
     directory.cd_to_topdir()
 
         filename = os.path.abspath(filename)
     directory.cd_to_topdir()