1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-04 18:48:43 +00:00
Commit graph

6707 commits

Author SHA1 Message Date
TW
32616111e0
Merge pull request #6901 from ThomasWaldmann/fix-5719-1.2
check: try harder to create the key, fixes #5719
2022-07-30 15:30:32 +02:00
Thomas Waldmann
ea4c47ec7a check: try harder to create the key, fixes #5719
the old code did just 1 attempt to detect the repo decryption key.
if the first chunkid we got from the chunks hashtable iterator was accidentally
the id of the chunk we intentionally corrupted in test_delete_double_force,
setup of the key failed and that made the test crash.

in practice, this could of course also happen if chunks are corrupted, thus
we now do many retries with other chunks before giving up.

error handling was improved: do not return None (instead of a key), it just
leads to weird crashes elsewhere, but fail early with IntegrityError and a
reasonable error msg.

rename method to make_key to avoid confusion with borg.crypto.key.identify_key.
2022-07-29 09:08:03 +02:00
TW
3d94c595b0
Merge pull request #6896 from ThomasWaldmann/ci-macos-1.2
CI: test on macOS 12 without fuse / fuse tests
2022-07-28 00:09:59 +02:00
Thomas Waldmann
9fb9508f4b CI: test on macOS 12 without fuse / fuse tests
too troublesome on github CI due to kernel extensions needed by macFUSE.
2022-07-27 23:10:10 +02:00
remyabel2
c56025000b
docs: add info on man page installation (#6894) 2022-07-27 13:46:48 +02:00
TW
4c3da429fb
Merge pull request #6890 from ThomasWaldmann/archive-progress-json-docs-1.2
docs: update archive_progress json description about "finished"
2022-07-27 12:46:59 +02:00
Thomas Waldmann
404fe33a8d docs: update archive_progress json description about "finished", see #6570 2022-07-25 13:06:06 +02:00
TW
a4a2530a29
Merge pull request #6877 from LocutusOfBorg/fix-template-1.2
Fix pyproject.toml to create a fixed _version.py file, compatible wi…
2022-07-19 16:41:41 +02:00
Gianfranco Costamagna
ad8555e921 Fix pyproject.toml to create a fixed _version.py file, compatible with both old and new setuptools_scm version (see: #6875) 2022-07-18 19:51:04 +02:00
TW
907764e018
Merge pull request #6850 from ThomasWaldmann/deprecated-prefix-option-1.2
deprecate --prefix, use -a / --glob-archives, see #6806
2022-07-09 16:57:58 +02:00
Thomas Waldmann
c265370cff deprecate --prefix, use -a / --glob-archives, see #6806 2022-07-09 16:12:34 +02:00
TW
a8c556b5e9
Merge pull request #6843 from ThomasWaldmann/expect-1.2
Automate asciinema screencasts (1.2-maint)
2022-07-07 00:36:59 +02:00
TW
8a42d88120 Merge pull request #6197 from hexagonrecursion/expect
Automate asciinema screencasts
2022-07-07 00:01:28 +02:00
TW
1fba67efee
Merge pull request #6824 from ThomasWaldmann/fix-progress-percent-docs-1.2
docs: json progress_percent: some values are optional, fixes #4074
2022-07-02 20:21:36 +02:00
Thomas Waldmann
bfae252593 docs: json progress_percent: some values are optional, fixes #4074
in the finished == true message, these are missing:
- message
- current / total
- info

This is to be somewhat consistent with #6683 by only providing a
minimal set of values for the finished case.

The finished messages is primarily intended for cleanup purposes,
e.g. clearing the progress display.
2022-07-01 14:31:23 +02:00
TW
9c463dc46b
Merge pull request #6816 from ThomasWaldmann/fix-hashindex-compact-1.2
hashindex_compact: fix eval order (check idx before use), fixes #5899
2022-06-30 20:57:38 +02:00
Thomas Waldmann
3f517b019a hashindex_compact: fix eval order (check idx before use), fixes #5899
also: fix "off by one" comment
2022-06-29 18:58:26 +02:00
TW
25c9826456
Merge pull request #6814 from fantasya-pbem/docs/5960_FAQ-quota-size_1.2-maint
[DOCS] #5960 - FAQ: Full quota / full disk
2022-06-29 18:55:36 +02:00
Thalian
6990aca7ac [DOCS] #5960 - FAQ: Full quota / full disk
Backport from master.
2022-06-29 17:56:23 +02:00
TW
0cac871b34
Merge pull request #6787 from ThomasWaldmann/chmod-optional-1.2
SaveFile: the chmod is optional, fixes #6786
2022-06-23 18:07:02 +02:00
Thomas Waldmann
89e24847b9 SaveFile: the chmod is optional, fixes #6786
some filesystems do not support chmod, just ignore if it is failing.
2022-06-23 17:43:21 +02:00
TW
7ee4b7035b
Merge pull request #6779 from ThomasWaldmann/paths-from-normpath-1.2
create --paths-from-(stdin|command): normalize paths, fixes #6778
2022-06-22 00:20:20 +02:00
Thomas Waldmann
ec2bf8e45d create --paths-from-(stdin|command): normalize paths, fixes #6778 2022-06-20 13:44:35 +02:00
TW
97c5c54a0c
Merge pull request #6775 from wizeman/fix-obfuscate-1.2
fix test_obfuscate byte accounting (backport #6773 to 1.2-maint)
2022-06-14 17:29:24 +02:00
Ricardo M. Correia
333320ad56 fix test_obfuscate byte accounting 2022-06-14 16:06:49 +02:00
TW
bab00fb47b
Merge pull request #6769 from ThomasWaldmann/safe-secure-erase-1.2
secure_erase: avoid collateral damage, fixes #6768
2022-06-13 19:41:38 +02:00
Thomas Waldmann
afcebf32f7 secure_erase: avoid collateral damage, fixes #6768
if a hardlink copy of a repo was made and a new repo config
shall be saved, do NOT fill in random garbage before deleting
the previous repo config, because that would damage the hardlink
copy.
2022-06-13 15:47:50 +02:00
TW
73b97f339b
Merge pull request #6765 from targhs/doc/correct-installation-shell-syntax
Correct shell syntax for installation using git
2022-06-12 19:48:03 +02:00
targhs
08629e4d83 Commit shell syntax for installation using git 2022-06-12 22:37:37 +05:30
TW
7f8a5bb9c3
Merge pull request #6753 from ThomasWaldmann/rel121
Release 1.2.1
2022-06-05 23:43:32 +02:00
Thomas Waldmann
9fad4ba1cb build_man 2022-06-05 20:14:26 +02:00
Thomas Waldmann
a7c1c1cb16 build_usage 2022-06-05 20:13:46 +02:00
Thomas Waldmann
6c0842ec42 update CHANGES 2022-06-05 20:09:06 +02:00
TW
b0c726abae
Merge pull request #6752 from ThomasWaldmann/vagrant-updates
Vagrant updates (1.2)
2022-06-05 20:03:03 +02:00
Thomas Waldmann
d8102774b6 vagrant: increase VMCPUS and xdistn from 4 to 16
esp. the darwin64 box based tests take ages, let's see
if they get faster with this.
2022-06-05 19:56:29 +02:00
TW
7475e661bf
Merge pull request #6751 from ThomasWaldmann/update-changes-1.2
update CHANGES (1.2)
2022-06-05 18:36:37 +02:00
TW
eeb55c10c4
Merge pull request #6749 from fantasya-pbem/docs/4776_FAQ_swapped-targets_main
[DOCS] #4776 - FAQ: How to swap backup media
2022-06-05 18:33:50 +02:00
Thalian
cfcf99ccb5 [DOCS] #4776 - FAQ: How to swap backup media
Backport from master.
2022-06-05 18:22:23 +02:00
Thomas Waldmann
4ae08ee972 update CHANGES 2022-06-05 18:18:49 +02:00
TW
cfc623e250
Merge pull request #6748 from ThomasWaldmann/update-changes-rel1118-1.2
update CHANGES with 1.1.18 changelog
2022-06-05 18:08:52 +02:00
Thomas Waldmann
677db66e9d update CHANGES with 1.1.18 changelog 2022-06-05 17:45:48 +02:00
Thomas Waldmann
96c748c1d2 vagrant: add ubuntu "jammy" 22.04 box 2022-06-05 17:35:05 +02:00
TW
7ab36ceb76
Merge pull request #6742 from ThomasWaldmann/msgpack104-1.2
msgpack 1.0.4 / py 3.11 (1.2-maint)
2022-06-03 10:37:31 +02:00
Thomas Waldmann
6d024961aa add python 3.11 to pypi metadata 2022-06-03 10:05:56 +02:00
Thomas Waldmann
d1ef35b4f0 CI: also test on python 3.11-dev 2022-06-03 10:05:56 +02:00
Thomas Waldmann
de61d4953b allow msgpack 1.0.4, fixes #6716 2022-06-03 10:05:44 +02:00
TW
03827bc684
Merge pull request #6738 from ThomasWaldmann/vagrant-updates-1.2
Vagrant updates (1.2-maint)
2022-06-01 20:19:55 +02:00
Thomas Waldmann
354b014b19 vagrant/testing: upgrade development.lock.txt
esp. the Cython version upgrade to 0.29.30 is important for python 3.11.
2022-06-01 19:51:55 +02:00
Thomas Waldmann
6b9a66b5fa vagrant: use pyinstaller 4.10
when installed via pip, this automatically build the bootloader now.
2022-06-01 19:49:37 +02:00
Thomas Waldmann
6063c21bd9 vagrant: use python 3.9.13 for binary build 2022-06-01 19:48:10 +02:00