Skip to content

Small fixes for double backup #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seppelucas merged 3 commits into from
May 18, 2026
Merged

Small fixes for double backup #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df28de4
contrib: Add -oLogLevel=error to ssh in double-backup main script
wdoekes May 18, 2026
67775c6
contrib: Fix never/newer typo in manual-zfssync.sh
wdoekes May 18, 2026
9292594
build: Fix tests by adding cffi explicitly
wdoekes May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/manual-zfssync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/planb-double-backup-sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
Loading