cmd_import: conform to new API of git-buildpackage

git-import-srpm automatically detects unpacked srpms. Also, prevent it
from automatically applying patches (to match the old behaviour).

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gitbuildsys/cmd_import.py b/gitbuildsys/cmd_import.py
index 5623cac..8d3b52a 100644 (file)
--- a/gitbuildsys/cmd_import.py
+++ b/gitbuildsys/cmd_import.py
@@ -42,11 +42,8 @@ def do(opts, args):
     params = ["argv[0] placeholder", "--packaging-dir=packaging",
               "--upstream-branch=%s" % opts.upstream_branch, args[0]]
 
-    if args[0].endswith('.src.rpm'):
-        if gbp_import_srpm(params):
-            msger.error("Failed to import %s" % args[0])
-    elif args[0].endswith('.spec'):
-        params.insert(1, "--unpacked")
+    if args[0].endswith('.src.rpm') or args[0].endswith('.spec'):
+        params.append("--no-patch-import")
         if gbp_import_srpm(params):
             msger.error("Failed to import %s" % args[0])
     else: