export: add force_native argument to create_gbp_export_args()

Re-introduce this argument to make it possible to fallback to native
packaging mode.

diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py
index dca52c5ccd44ffff36905d9c687b5b10f96f5a84..1094c0b502676c623545e90855f6298b2fcd60cc 100644 (file)
--- 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: