From 04be4011d7217a72e7e5bd45c9f42d38cb35aaf6 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 29 Sep 2014 11:45:54 +0300 Subject: [PATCH] export: add force_native argument to create_gbp_export_args() Re-introduce this argument to make it possible to fallback to native packaging mode. --- gitbuildsys/cmd_export.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py index dca52c5..1094c0b 100644 --- a/gitbuildsys/cmd_export.py +++ b/gitbuildsys/cmd_export.py @@ -91,7 +91,7 @@ def untrack_export_branches(repo, branches): repo.delete_branch(branch) def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, - create_tarball=True): + force_native=False, create_tarball=True): """ Construct the cmdline argument list for git-buildpackage export """ @@ -148,7 +148,7 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, argv.append("--git-no-create-orig") if args.debug: argv.append("--git-verbose") - if is_native_pkg(repo, args) or args.no_patch_export: + if force_native or is_native_pkg(repo, args) or args.no_patch_export: argv.extend(["--git-no-patch-export", "--git-upstream-tree=%s" % commit]) else: -- 2.34.1