From: Markus Lehtonen Date: Wed, 23 Apr 2014 10:31:07 +0000 (+0300) Subject: export: fix bug in generation of gbp cmdline options X-Git-Tag: 0.22~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84bfbca8de03524d2b6f21e26209c8b510dec6f1;p=tools%2Fgbs.git export: fix bug in generation of gbp cmdline options Always give '--git-export' option to git-buildpackage-rpm. This bug was introduced when enabling the support for development branches. Change-Id: I48daf69723979b04dbb6f12304e5dcb20666b44a Signed-off-by: Markus Lehtonen --- diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py index 9c0b7e6..3441ebd 100644 --- a/gitbuildsys/cmd_export.py +++ b/gitbuildsys/cmd_export.py @@ -127,6 +127,7 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, packaging_dir = get_packaging_dir(args) # Now, start constructing the argument list + export_rev = commit argv = ["argv[0] placeholder", "--git-color-scheme=magenta:green:yellow:red", "--git-ignore-new", @@ -148,7 +149,6 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, argv.append("--git-verbose") if is_native_pkg(repo, args) or args.no_patch_export: argv.extend(["--git-no-patch-export", - "--git-export=%s" % commit, "--git-upstream-tree=%s" % commit]) else: # Check if the revision seems to be of an orphan development branch @@ -171,14 +171,14 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, ]) if orphan_packaging: - argv.extend(["--git-export=%s" % orphan_packaging, - "--git-patch-export-rev=%s" % commit]) - else: - argv.extend(["--git-export=%s" % commit]) + export_rev = orphan_packaging + argv.extend(["--git-patch-export-rev=%s" % commit]) if repo.has_branch("pristine-tar"): argv.extend(["--git-pristine-tar"]) + argv.append("--git-export=%s" % export_rev) + if 'source_rpm' in args and args.source_rpm: argv.extend(['--git-builder=rpmbuild', '--git-rpmbuild-builddir=.',