From df28de4893e174ecd9844931759c29ec89855d2b Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Mon, 18 May 2026 10:18:30 +0200 Subject: [PATCH 1/3] contrib: Add -oLogLevel=error to ssh in double-backup main script This fixes so we don't have to see login banners. --- contrib/planb-double-backup-sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/planb-double-backup-sources.py b/contrib/planb-double-backup-sources.py index 449eb3e..dd23232 100755 --- a/contrib/planb-double-backup-sources.py +++ b/contrib/planb-double-backup-sources.py @@ -63,7 +63,7 @@ def __iter__(self): def get_server_datasets(server): return check_output( - ['ssh', server, 'planb', 'blist', '--double'], + ['ssh', server, '-oLogLevel=error', 'planb', 'blist', '--double'], text=True).splitlines() From 67775c6eaabdfd1ffa377d4f85571b4869ac28a4 Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Mon, 18 May 2026 10:19:10 +0200 Subject: [PATCH 2/3] contrib: Fix never/newer typo in manual-zfssync.sh --- contrib/manual-zfssync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/manual-zfssync.sh b/contrib/manual-zfssync.sh index 6a170f2..e39c888 100755 --- a/contrib/manual-zfssync.sh +++ b/contrib/manual-zfssync.sh @@ -276,7 +276,7 @@ _recv() { echo "warning: We have newer snapshots ($newer_snapshots) after" \ "$remote${commonsnap:-@(void)}, adding recv -F" >&2 else - echo "warning: We have never snapshots ($newer_snapshots) after" \ + echo "warning: We have newer snapshots ($newer_snapshots) after" \ "$remote${commonsnap:-@(void)}, expect failure" >&2 fi fi From 92925940de8a4f419a98ee67aa837fe1371330e3 Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Mon, 18 May 2026 10:37:46 +0200 Subject: [PATCH 3/3] build: Fix tests by adding cffi explicitly libcffi.so was missing apparently. --- .github/workflows/tests.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d588932..a87fdb9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -38,7 +38,8 @@ jobs: - name: Install dependencies run: | apt-get update - apt-get install -qy --no-install-recommends libsqlite3-0 tzdata + apt-get install -qy --no-install-recommends \ + libsqlite3-0 python3-cffi-backend tzdata uv tool install tox --with tox-gh-actions --with tox-uv - name: Run tests with tox