Skip to content
Snippets Groups Projects

Update for compatibility with Trixie

Merged Walter Lozano requested to merge wip/wlozano/license-trixie into apertis/v2026dev1
All threads resolved!
3 files
+ 17
8
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -15,10 +15,12 @@ from pathlib import Path
from debian.changelog import Changelog, VersionError, format_date
from debian.debian_support import Version
from sh import __version__ as sh_version
from sh.contrib import git
APERTIS_CI_NAME = "Apertis CI"
APERTIS_CI_EMAIL = "devel@lists.apertis.org"
RETURN_CMD = {} if sh_version.startswith("1.") else {"_return_cmd": True}
def git_dir() -> str:
@@ -176,7 +178,7 @@ def main():
"merge",
"--ff-only",
rebase_tip,
_return_cmd=True,
**RETURN_CMD,
_ok_code=[0, 128],
_out="/dev/stdout",
_err="/dev/stderr",
@@ -216,7 +218,7 @@ def main():
args.upstream,
":!debian/changelog",
":!debian/apertis/*",
_return_cmd=True,
**RETURN_CMD,
_ok_code=[0, 1],
)
msg = [f"Sync from {args.upstream}."]
Loading