diff --git a/tools/apertis-pkg-merge-updates b/tools/apertis-pkg-merge-updates index 93667b53ec837843b7f664e1cb8daea106d476ba..01587579a67ae47c59a5e4c753d4af8d5da12774 100755 --- a/tools/apertis-pkg-merge-updates +++ b/tools/apertis-pkg-merge-updates @@ -176,6 +176,7 @@ def main(): "merge", "--ff-only", rebase_tip, + _return_cmd=True, _ok_code=[0, 128], _out="/dev/stdout", _err="/dev/stderr", @@ -215,6 +216,7 @@ def main(): args.upstream, ":!debian/changelog", ":!debian/apertis/*", + _return_cmd=True, _ok_code=[0, 1], ) msg = [f"Sync from {args.upstream}."] diff --git a/tools/apertis-pkg-merge-upstream-to-downstreams b/tools/apertis-pkg-merge-upstream-to-downstreams index fdc31a0c3b538299c54562d7e98b8573418d8b5d..fd363c4b8bf4956ad6cba6d529c41a2188c55780 100755 --- a/tools/apertis-pkg-merge-upstream-to-downstreams +++ b/tools/apertis-pkg-merge-upstream-to-downstreams @@ -91,6 +91,7 @@ def is_minor_change(upstream, downstream): downstream, ":!debian/changelog", ":!debian/apertis/*", + _return_cmd=True, _ok_code=[0, 1], ) return o.exit_code == 0 @@ -356,6 +357,7 @@ def main(): "--is-ancestor", upstream_branch, downstream_branch, + _return_cmd=True, _ok_code=[0, 1], ).exit_code == 0 @@ -435,7 +437,11 @@ def main(): conflicts.append(conflict) else: o = git( - "diff", "--quiet", f"HEAD..{downstream_branch}", _ok_code=[0, 1] + "diff", + "--quiet", + f"HEAD..{downstream_branch}", + _return_cmd=True, + _ok_code=[0, 1], ) if o.exit_code == 0: print(f"No merge required for {downstream_branch}, skipping ") diff --git a/tools/apertis-pkg-pull-updates b/tools/apertis-pkg-pull-updates index 3dbc3417d5522da2aa7eb0f3322997eecc3d075a..9be3571605733f5d4735ba87e5e9160d7e560f1d 100755 --- a/tools/apertis-pkg-pull-updates +++ b/tools/apertis-pkg-pull-updates @@ -55,7 +55,15 @@ def parse_ref(ref: str) -> str: def is_ancestor(this: str, other: str): return ( - git("merge-base", "--is-ancestor", this, other, _ok_code=[0, 1]).exit_code == 0 + git( + "merge-base", + "--is-ancestor", + this, + other, + _return_cmd=True, + _ok_code=[0, 1], + ).exit_code + == 0 ) @@ -433,6 +441,7 @@ def main(): "merge", "--ff-only", local_version_branch, + _return_cmd=True, _out="/dev/stdout", _err="/dev/stderr", )