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
+ 19
2
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -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}."]
Loading