From: Markus Lehtonen Date: Wed, 11 Jul 2012 12:28:25 +0000 (+0300) Subject: cmd_import: conform to new API of git-buildpackage X-Git-Tag: 0.10~80^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=267124988bd28006765c2ec907427acb7b035757;p=tools%2Fgbs.git 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 --- diff --git a/gitbuildsys/cmd_import.py b/gitbuildsys/cmd_import.py index 5623cac..8d3b52a 100644 --- 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: