mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
6,130 Commits 9 Branches 132 Tags 68 MiB
Commit Graph

6130 Commits

Author SHA1 Message Date
bobthebadguy 2cdf0df14d Clarify usage of patternfile roots (#6242) 2022-02-08 17:37:25 +03:00
TW 324e2191a8
Merge pull request #6253 from hexagonrecursion/bp-locked 
Backport: add locked requirements
 2022-02-07 20:21:44 +01:00
TW 16219f3f52
Merge pull request #6261 from hexagonrecursion/bp-nonce 
Backport: Doc: impact of deleting path/to/repo/nonce
 2022-02-07 20:16:54 +01:00
Andrey Bienkowski f7039d5619 Apply review suggestions 2022-02-07 11:44:03 +03:00
Andrey Bienkowski 9557821715 Review suggestion: mention local nonce path 
> do we maybe also want to mention the specific path where the local
> nonce is kept?
 2022-02-07 11:44:03 +03:00
Andrey Bienkowski 6a4305b255 Doc: warn about tampered server nonce 
https://github.com/borgbackup/borg/pull/6188#discussion_r794752672
> Well, guess one could also use max(list of trusted nonce values).
>
> The real issue is if you have lost all or some of the trusted
> (client side) nonce values and you also have reason to not trust the
> server side nonce, because someone might attack you on the server.
 2022-02-07 11:44:03 +03:00
Andrey Bienkowski 2652ec6fc0 Doc: impact of deleting path/to/repo/nonce 
Fixes: https://github.com/borgbackup/borg/issues/5858
 2022-02-07 11:44:03 +03:00
Andrey Bienkowski 05b2187c1d Refactor: extract get_security_dir() 2022-02-07 11:44:03 +03:00
Andrey Bienkowski 7b6abebf71 Strengthen the test: we can read data w/o nonces 2022-02-07 11:44:03 +03:00
Andrey Bienkowski 9a42c04706 Add tests for path/to/repo/nonce deletion 
I am about to add documentation for this feature. Per the "If you liked
it, you should have put a CI test on it" rule I am adding tests to
detect if the feature regresses (causing a discrepancy between the docs
and the real behavior).
 2022-02-07 11:34:36 +03:00
Andrey Bienkowski 30a79d986a Update development.lock.txt and restore development.txt 2022-02-07 00:26:22 +03:00
Andrey Bienkowski 1d36773b29 Unlock pytest on python3.10 2022-02-07 00:14:25 +03:00
Andrey Bienkowski b0746a44ea cp requirements.d/development.lock.txt requirements.d/development.txt 2022-02-06 23:45:35 +03:00
Andrey Bienkowski 8eeb32b165 try pytest==6.1.1 2022-02-06 23:40:28 +03:00
Andrey Bienkowski 85d59fe0f5 use pip -U -r requirements.d/development.txt 2022-02-06 23:29:58 +03:00
Andrey Bienkowski 1ee72e1b0e use a real python 3.5 to generate frozen reqs 2022-02-06 08:06:17 +03:00
TW 377971e824
Merge pull request #6244 from hexagonrecursion/bp-keyfile 
Backport: Disallow overwriting of existing keyfiles on init
 2022-02-06 00:05:47 +01:00
TW eacd42bbcb
Merge pull request #6251 from hexagonrecursion/bp-pyinstaller 
Backport: setuptools 60.7.0 is breaks pyinstaller
 2022-02-05 22:32:40 +01:00
Andrey Bienkowski 28df8d38da Backport: setuptools 60.7.0 is breaks pyinstaller 
This is a backport of https://github.com/borgbackup/borg/pull/6246
 2022-02-05 22:53:10 +03:00
Andrey Bienkowski 365c1c8b5d Fix ArchiverTestCaseBinary.test_init_refuse_to_overwrite_keyfile 2022-02-05 22:26:24 +03:00
Andrey Bienkowski b442eb4660 Fix import error 2022-02-05 08:59:19 +03:00
Andrey Bienkowski 0f8485f7a4 Test: borg init refuses to overwrite keyfile 
https://github.com/borgbackup/borg/pull/6046 neglected to
add a regression test
 2022-02-05 08:46:42 +03:00
Thomas Waldmann 68b603192f use create=True when creating new keys, fixes #6036 2022-02-05 08:46:24 +03:00
Thomas Waldmann de2c92b172 KeyfileKeyBase: add create=False param to save method 
If we create a new repo (and a new keyfile key, create=True),
there must not already exist a keyfile at the path/filename
where we want to write the new one.

In other use cases (e.g. if we overwrite a keyfile due
to the user changing their passphrase, create=False),
of course overwriting at the same path/fname is desired.
 2022-02-05 08:46:24 +03:00
TW 6880c698b9
Merge pull request #6236 from hexagonrecursion/bp-key-export 
Backport: Doc: borg key export: add examples
 2022-02-04 20:50:44 +01:00
Andrey Bienkowski 77ab224294 Backport: Doc: borg key export: add examples 
This is a backport of #6227
 2022-02-04 22:36:45 +03:00
TW b2d353f358
Merge pull request #6226 from hexagonrecursion/bp-setuptools 
Backport: exclude buggy current setuptools release
 2022-02-03 22:26:45 +01:00
Thomas Waldmann b2bbdb1454 Backport: exclude buggy current setuptools release 
setuptools>45 was added in 0e9befb539.
This constrint was never backported to 1.1.
My backport honors that.

> see there: https://github.com/pypa/setuptools/issues/3063
 2022-02-03 10:10:08 +03:00
TW 65a19ce2a2
Merge pull request #6219 from ThomasWaldmann/1.1-maint 
if ensure_dir() fails, give more informative error message, fixes #5952
 2022-02-01 04:24:55 +01:00
Thomas Waldmann b9e2e01735 if ensure_dir() fails, give more informative error message, fixes #5952 
previously, it just said PermissionDenied with giving the filename/path.
 2022-02-01 04:05:17 +01:00
TW 656ca1dafa
Merge pull request #6215 from ThomasWaldmann/docs-patterns-stable-1.1 
docs updates about features not experimental any more (1.1)
 2022-01-31 21:36:09 +01:00
Thomas Waldmann 6e9119d923 docs: FUSE "versions" view is not experimental any more 2022-01-31 21:17:57 +01:00
Thomas Waldmann 36dbf551fa docs: --pattern* not experimental any more, fixes #6134 2022-01-31 21:17:37 +01:00
TW 887c90d50a
Merge pull request #6199 from ThomasWaldmann/cleanup-location-1.1 
repo::archive location placeholder expansion fixes
 2022-01-31 21:10:16 +01:00
TW 247f186dba
Merge pull request #6211 from ThomasWaldmann/cygwin-packages-1.1 
Cygwin package updates
 2022-01-31 00:28:46 +01:00
Thomas Waldmann ff3465c27f docs: fix/update cygwin package requirements 2022-01-31 00:26:47 +01:00
TW 6cdadb6009
Merge pull request #6210 from ThomasWaldmann/vagrant-updates5-1.1 
Vagrant updates
 2022-01-31 00:23:29 +01:00
Thomas Waldmann d0fd7d0824 vagrant: adapt memory for openindiana64 
use same amount as in master branch.
 2022-01-31 00:21:01 +01:00
Thomas Waldmann c115581098 vagrant: more memory for darwin64 
maybe this speeds up the VM a bit.
 2022-01-31 00:19:48 +01:00
Thomas Waldmann 45fd143786 vagrant: also invoke setup.py clean2 
clean2 was added to work around some setuptools customizability limitation.
 2022-01-31 00:19:01 +01:00
Thomas Waldmann 8e6aeebd60 vagrant: use macfuse instead of osxfuse 
note: we also use the more recent macfuse on github CI.
 2022-01-31 00:17:20 +01:00
Thomas Waldmann b2c3099fb9 vagrant: fix vagrant scp on macOS, fixes #5921 
it did not find pyenv in PATH, resulting in unpretty error messages.
 2022-01-31 00:16:19 +01:00
TW a844eecffa
Merge pull request #6205 from ThomasWaldmann/delete-repo-forced-1.1 
delete --force: do not ask when deleting a repo, fixes #5941
 2022-01-30 23:17:52 +01:00
Thomas Waldmann 59d28f9f7f delete --force: do not ask when deleting a repo, fixes #5941 2022-01-30 20:08:23 +01:00
TW 495b82e45b
Merge pull request #6202 from ThomasWaldmann/fix-del-nonexist-1.1 
delete: don't commit if nothing was deleted, avoid cache sync, fixes #6060
 2022-01-30 19:50:55 +01:00
Thomas Waldmann e52feec09c delete: don't commit if nothing was deleted, avoid cache sync, fixes #6060 2022-01-30 18:17:49 +01:00
Thomas Waldmann 0eb33389d3 Location: fix bad naming: rename .orig -> .processed 
- .raw is the unprocessed location (as given by user / env).
- .processed is the processed location (after placeholder replacement).
 2022-01-30 03:46:11 +01:00
Thomas Waldmann ccc41b394e repo::archive location placeholder expansion fixes, fixes #5826, fixes #5998 
- use expanded location for log output
- support placeholder expansion for BORG_REPO env var
- use Location.raw for the unprocessed, not expanded location string
 2022-01-30 03:38:22 +01:00
Andrey Bienkowski d67a1e7733
Refactor: remove assert_true (1.1) (#6158) 
Refactor: remove assert_true (1.1)

Work toward #28

This PR removes the usage of assert_true in the 1.1 branch
 2022-01-29 23:21:46 +01:00
TW 932a06ec32
Merge pull request #6198 from ThomasWaldmann/update-changes-1.1 
update CHANGES
 2022-01-29 19:09:01 +01:00