1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 02:08:54 +00:00
Commit graph

7100 commits

Author SHA1 Message Date
Thomas Waldmann
53830ecae9 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 10:34:58 +02:00
TW
e7c2506a7f
Merge pull request #6895 from ThomasWaldmann/ci-macos-master
CI: test on macOS 12 without fuse / fuse tests
2022-07-28 00:09:50 +02:00
Thomas Waldmann
ba1a26ffa5 CI: test on macOS 12 without fuse / fuse tests
too troublesome on github CI due to kernel extensions needed by macFUSE.
2022-07-27 22:31:06 +02:00
TW
61e8d9518b
Merge pull request #6784 from borgbackup/borg2
borg 2
2022-07-27 16:09:34 +02:00
Thomas Waldmann
ad7c7159b2 Merge branch 'master' into borg2 2022-07-27 13:49:50 +02:00
remyabel2
ddb805cd10
docs: add info on man page installation (#6888)
docs: add info about man page installation, fixes #6661
2022-07-27 12:48:27 +02:00
TW
19509f5fa5
Merge pull request #6889 from ThomasWaldmann/archive-progress-json-docs-master
docs: update archive_progress json description about "finished"
2022-07-27 12:47:12 +02:00
Thomas Waldmann
c7e719f209 docs: update archive_progress json description about "finished", see #6570 2022-07-25 13:05:16 +02:00
TW
a75b260fef
Merge pull request #6884 from a1346054/fixes
Fix typos and shellcheck warnings
2022-07-23 21:44:27 +02:00
Thomas Waldmann
dfbf638a5b Merge branch 'master' into borg2 2022-07-23 21:21:41 +02:00
a1346054
41d67bc449
fix shellcheck warnings in bash scripts 2022-07-22 15:52:04 +00:00
a1346054
160dd877ab
fix typos 2022-07-22 15:51:46 +00:00
TW
320190dacf
Merge pull request #6880 from ThomasWaldmann/new-crypto-no-assert-id-borg2
new crypto does not need to call ._assert_id()
2022-07-21 20:44:21 +02:00
Thomas Waldmann
b0db800b5a check: --verify-data does not need to decompress with new crypto modes 2022-07-20 15:51:33 +02:00
Thomas Waldmann
9d6c98d9f9 docs: remove _assert_id() call for new crypto 2022-07-20 14:31:37 +02:00
Thomas Waldmann
f82f123b56 new crypto does not need to call ._assert_id()
https://github.com/borgbackup/borg/pull/6463#discussion_r925436156
2022-07-20 14:13:25 +02:00
TW
b52781a999
Merge pull request #6876 from LocutusOfBorg/fix-template
Fix pyproject.toml to create a fixed _version.py file, compatible wi…
2022-07-18 19:42:32 +02:00
Gianfranco Costamagna
a92c156e05 Fix pyproject.toml to create a fixed _version.py file, compatible with both old and new setuptools_scm version (see: #6875) 2022-07-18 18:56:59 +02:00
TW
0037375148
Merge pull request #6869 from ThomasWaldmann/rel200a4
release 2.0.0a4
2022-07-17 16:03:45 +02:00
Thomas Waldmann
357aa5241b build_usage / build_man 2022-07-17 09:23:06 +02:00
TW
d9f72b6ed2
Merge pull request #6866 from ThomasWaldmann/update-changes-borg2
update CHANGES
2022-07-17 08:48:14 +02:00
Thomas Waldmann
32a7896573 update CHANGES 2022-07-16 23:16:39 +02:00
TW
17e74caccd
Merge pull request #6864 from ThomasWaldmann/remove-tilde-otheruser-borg2
ssh:// URLs: remove support for /~otheruser/, see #6855
2022-07-16 18:53:28 +02:00
Thomas Waldmann
47c2672a64 ssh:// URLs: remove support for /~otheruser/, see #6855
If you used this, just replace it by:

ssh://user@host:port/home/otheruser/
2022-07-15 16:02:45 +02:00
TW
65703df839
Merge pull request #6862 from ThomasWaldmann/mypy-borg2
add mypy
2022-07-15 15:23:07 +02:00
Thomas Waldmann
b8e48c5036 mypy: fixes / annotations 2022-07-15 14:54:48 +02:00
Thomas Waldmann
366ef73f88 mypy: rename yes module to yes_no to avoid name collision 2022-07-15 14:46:18 +02:00
Thomas Waldmann
f71f26ddfd mypy: fix platform package
clean up imports, remove unused stuff
2022-07-15 13:15:11 +02:00
Thomas Waldmann
b07aeef498 add mypy checking
also added some .pyi files needed to check the cython code (taken from #5703 and updated).

fixed "syntax error" in key.py.

all mypy complaints not fixed yet.
2022-07-15 12:49:38 +02:00
TW
c5fa64a9a4
Merge pull request #6860 from ThomasWaldmann/remove-legacy-cleanup-borg2
remove legacy_cleanup
2022-07-13 18:18:04 +02:00
TW
d5c91cd37b
Merge pull request #6859 from ThomasWaldmann/remove-attic-stuff-borg2
remove remainders of attic legacy
2022-07-13 18:17:47 +02:00
TW
b37f660d8b
Merge pull request #6858 from ThomasWaldmann/remove-scp-tilde-expansion-borg2
we remove scp style, also remove it for tilde expansion, fixes #6856
2022-07-13 18:16:57 +02:00
Thomas Waldmann
2d2f468410 remove legacy_cleanup
not needed any more.
2022-07-13 17:06:52 +02:00
Thomas Waldmann
7bc7f01342 remove remainders of attic legacy
we expect that everybody has upgraded to borg
using borg 1.2.x or older, thus we do not need
to care about attic repos any more in borg2.
2022-07-13 16:55:29 +02:00
Thomas Waldmann
1de12eacb7 we remove scp style, also remove it for tilde expansion, fixes #6856 2022-07-13 16:42:46 +02:00
TW
ca74118b61
Merge pull request #6849 from ThomasWaldmann/update-changes-borg2
update CHANGES
2022-07-09 16:58:27 +02:00
TW
a3035270da
Merge pull request #6848 from ThomasWaldmann/split-archiver
split archiver
2022-07-09 16:58:13 +02:00
Thomas Waldmann
55a5c5867a update CHANGES 2022-07-09 15:34:15 +02:00
Thomas Waldmann
ea6b373f85 move common options definition to archiver.common 2022-07-09 15:13:13 +02:00
Thomas Waldmann
b2fb334af0 sort build_parser calls / mixins 2022-07-09 15:13:13 +02:00
Thomas Waldmann
70b54a696f move create command to archiver.create 2022-07-09 15:13:13 +02:00
Thomas Waldmann
c871dbd8a5 move recreate command to archiver.recreate 2022-07-09 15:13:13 +02:00
Thomas Waldmann
ae6ef77495 move extract command to archiver.extract 2022-07-09 15:13:13 +02:00
Thomas Waldmann
e05f7971da move build_filter/build_matcher to archiver.common 2022-07-09 15:13:13 +02:00
Thomas Waldmann
e57f3bb424 move info command to archiver.info 2022-07-09 15:13:13 +02:00
Thomas Waldmann
4d5a89ebc3 move rinfo command to archiver.rinfo 2022-07-09 15:13:13 +02:00
Thomas Waldmann
add73745c6 move rlist command to archiver.rlist 2022-07-09 15:13:13 +02:00
Thomas Waldmann
b959ff913a move list command to archiver.list_cmd
note: can't be named "archiver.list" due to collision with builtin type "list".
2022-07-09 15:13:13 +02:00
Thomas Waldmann
382b37ef60 move list command to archiver.list 2022-07-09 15:13:13 +02:00
Thomas Waldmann
350a8fe252 move delete command to archiver.delete 2022-07-09 15:13:13 +02:00