diff --git a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams index 29eef00932629fad344a7833220258c59089d0d7..d7c928cdcbea16885d6ca05a29cf07f4e2a01de9 100755 --- a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams +++ b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams @@ -94,7 +94,7 @@ def main(): print("New target, doing merge") proposed_branch = f"proposed-updates/{upstream_branch}/{ref[0:8]}" git.checkout("-B", proposed_branch) - apertis_pkg_merge_updates(f"--downstream={downstream_branch}", f"--upstream={upstream_branch}", "--local-version-suffix={local_suffix}", _fg=True) + apertis_pkg_merge_updates(f"--downstream={downstream_branch}", f"--upstream={upstream_branch}", f"--local-version-suffix={local_suffix}", _fg=True) o = git('diff', '--quiet', f"HEAD..{downstream_branch}", _ok_code=[0,1]) if o.exit_code == 1: print("Merge done, pushing")