import_srpm: allow for more than one argument

otherwise giving a target dir always raises an error

(introduced by 03276df5b9391dc877521cd6c3553ca071157991)

2 files changed, 18 insertions, 4 deletions

diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index 64a636a5..bd234c6c 100755
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -122,7 +122,7 @@ def build_parser(name):
         parser = GbpOptionParserRpm(command=os.path.basename(name),
                                     prefix='',
                                     usage='%prog [options] /path/to/package'
-                                          '.src.rpm [<target>]')
+                                          '.src.rpm [target]')
     except GbpError as err:
         gbp.log.err(err)
         return None
@@ -208,7 +208,13 @@ def main(argv):
     if not options:
         return ExitCodes.parse_error
 
-    if len(args) != 1:
+    if len(args) == 1:
+        srpm = args[0]
+        target = None
+    elif len(args) == 2:
+        srpm = args[0]
+        target = args[1]
+    else:
         gbp.log.err("Need to give exactly one package to import. Try --help.")
         return 1
     try:
@@ -217,7 +223,6 @@ def main(argv):
         gbp.log.err(err)
         return 1
     try:
-        srpm = args[0]
         if options.download:
             srpm = download_source(srpm)
 
@@ -261,7 +266,7 @@ def main(argv):
         except GitRepositoryError:
             gbp.log.info("No git repository found, creating one.")
             is_empty = True
-            target = args[1] if len(args) == 2 else spec.name
+            target = target or spec.name
             repo = RpmGitRepository.create(target)
             os.chdir(repo.path)
 
diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py
index bc942588..6e714c35 100644
--- a/tests/component/rpm/test_import_srpm.py
+++ b/tests/component/rpm/test_import_srpm.py
@@ -76,6 +76,15 @@ class TestImportPacked(ComponentTestBase):
         # Two commits: upstream and packaging files
         eq_(len(repo.get_commits()), 2)
 
+    def test_target_dir(self):
+        """Test importing to target dir"""
+        srpm = os.path.join(DATA_DIR, 'gbp-test-1.0-1.src.rpm')
+        eq_(mock_import(['--no-pristine-tar', srpm, 'targetdir']), 0)
+        # Check repository state
+        assert os.path.exists('targetdir')
+        repo = GitRepository('targetdir')
+        self._check_repo_state(repo, 'master', ['master', 'upstream'])
+
     def test_basic_import_orphan(self):
         """
         Test importing of non-native src.rpm to separate packaging and