From dbe29b4cf8b0f3146029575fb63372122a1ac531 Mon Sep 17 00:00:00 2001 From: wangbiao Date: Tue, 21 Nov 2023 18:20:20 +0900 Subject: [PATCH] merge latest patch Change-Id: I24babab682706fcab04f624c8026af949514e141 Signed-off-by: wangbiao --- gitbuildsys/cmd_export.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py index cbba896..5a59678 100644 --- a/gitbuildsys/cmd_export.py +++ b/gitbuildsys/cmd_export.py @@ -163,18 +163,18 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, if force_native or is_native_pkg(repo, args) or args.no_patch_export: argv.append('--git-native=on') else: - argv.append('--git-native=off') # Check if the revision seems to be of an orphan development branch - is_orphan = False export_commitish = 'HEAD' if commit == 'WC.UNTRACKED' else commit try: repo.get_merge_base(export_commitish, upstream_branch) except GitRepositoryError: - is_orphan = True - # Development branch in orphan packaging model is identified in the conf - orphan_packaging = configmgr.get('packaging_branch', 'orphan-devel') - - if not is_orphan: + log.warn("No common ancestor between export commit and upstream, " + "enable native packaging mode") + argv.append('--git-native=on') + else: + argv.append('--git-native=off') + # Development branch in orphan packaging model is identified in the conf + orphan_packaging = configmgr.get('packaging_branch', 'orphan-devel') argv.extend(["--git-patch-export", "--git-patch-export-compress=100k", "--git-patch-export-squash-until=%s" % @@ -187,8 +187,8 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, export_rev = orphan_packaging argv.extend(["--git-patch-export-rev=%s" % commit]) - if repo.has_branch("pristine-tar"): - argv.extend(["--git-pristine-tar"]) + if repo.has_branch("pristine-tar"): + argv.extend(["--git-pristine-tar"]) argv.append("--git-export=%s" % export_rev) -- 2.34.1