mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-24 15:12:00 +00:00
Code Issues Releases Wiki Activity
5672 commits 9 branches 139 tags 63 MiB
Commit graph

5672 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thiago Macieira
575a348ce4 Fix broken test that relied on improper zlib assumptions 
This test assumed that zlib would always produce the same output for a
given input, and that assumption has proven incorrect. It rested on
zlib never improving. The zlib shipped in Clear Linux has algorithm
improvements, which caused this test to break.

This patch instead decompresses the expected value and compares that.

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
 2019-06-25 16:00:11 -07:00
Elmar Hoffmann
443958a79b support xxh64 checksum in addition to the hashlib hashes in borg list 
also: point out it is not a cryptographic hash
 2019-06-24 08:46:58 +02:00
TW
70e921d022
Merge pull request #4640 from russelldavis/fix-osxfuse-link 
Fix osxfuse github link in installation docs
 2019-06-24 08:20:12 +02:00
Russell Davis
3fb5998bae Fix osxfuse github link in installation docs 
It was broken because there's already a different reference named
github in `docs/global.rst.inc`. Fixed by using an anonymous hyperlink
reference, per https://stackoverflow.com/a/14067756/278488
 2019-06-23 19:24:37 -07:00
TW
fac8f57c31
Merge pull request #4636 from elho/second-archive-placeholder 
Enable placeholder usage in all extra archive arguments
 2019-06-23 12:54:06 +02:00
Elmar Hoffmann
a26065064d enable placeholder usage in all extra archive arguments 2019-06-23 02:28:26 +02:00
TW
72979caf8b
Merge pull request #4625 from ThomasWaldmann/oi 
vagrant: add up-to-date openindiana box (py35, openssl10)
 2019-06-17 12:05:58 +02:00
Thomas Waldmann
7a175d79b6 vagrant: add up-to-date openindiana box (py35, openssl10) 2019-06-17 02:49:56 +02:00
TW
ade48b6ecc
Merge pull request #4623 from elho/docs-typofix 
Documentation spelling fix
 2019-06-15 20:58:58 +02:00
Elmar Hoffmann
d2595065b4 fix spelling 2019-06-15 13:19:43 +02:00
TW
47fa7a83a7
Merge pull request #4620 from ThomasWaldmann/quickstart-passphrase-providing-master 
how to supply a passphrase, use crypto devices, fixes #4549
 2019-06-10 23:21:59 +02:00
TW
a178a110f0
Merge pull request #4619 from ThomasWaldmann/document-extract-limitation-master 
extract: document limitation "needs empty destination", fixes #4598
 2019-06-10 23:21:03 +02:00
Thomas Waldmann
faae9c9d56 how to supply a passphrase, use crypto devices, fixes #4549 2019-06-10 22:31:29 +02:00
Thomas Waldmann
897e81dbe9 extract: document limitation "needs empty destination", fixes #4598 2019-06-10 21:39:35 +02:00
TW
b989b66584
Merge pull request #4616 from ThomasWaldmann/fix-4607-extract-hl-crash-master 
extract: fix KeyError for "partial" extraction, fixes #4607 (master fwd port)
 2019-06-10 21:09:16 +02:00
Thomas Waldmann
71c7efd17c extract: fix KeyError for "partial" extraction, fixes #4607 
note that "partial" even applied to giving an always matching condition.

"full" is only assumed if no conditions are given.
 2019-06-10 20:18:44 +02:00
TW
0ecd4e19c0
Merge pull request #4612 from ThomasWaldmann/master-fixes 
remove superfluous whitespace in docs
 2019-06-09 14:45:56 +02:00
Thomas Waldmann
dc8077acba remove superfluous whitespace in docs 2019-06-09 14:45:18 +02:00
TW
8a6463d7bc
Merge pull request #4605 from ThomasWaldmann/use-borg-repo 
Use BORG_REPO
 2019-06-04 23:37:27 +02:00
TW
8c29209195
Merge pull request #4602 from FelixSchwarz/unbundle-xxhash 
ability to unbundle xxhash
 2019-06-04 23:36:56 +02:00
TW
8f27861c74
Merge pull request #4603 from FelixSchwarz/fix-cython-setup 
setup.py: fix detection of missing Cython
 2019-06-04 23:17:51 +02:00
Felix Schwarz
2ff06c58f0 ability to use a system-provided version of "xxhash" 
The build process can be controlled via environment variables
similar to other bundled libraries in borgbackup. The main difference
is probably that upstream does not provide a pkgconfig file for
xxhash.

Therefore borg will probably fail to detect the system-provided
version by default (tested on Fedora, seems like Debian and Ubuntu
do not ship a pkgconfig file either). I kept the pkgconfig lookup
code anyway to keep the code as similar as possible to
"setup_compress.py"/"setup_crypto.py".

Setting BORG_LIBXXHASH_PREFIX=/usr helps borg to detect xxhash
on my system (Fedora). You can force the use of the bundled
version of xxhash by setting BORG_USE_BUNDLED_XXHASH=1.
 2019-06-04 21:59:26 +02:00
Felix Schwarz
ce146c8b55 reference struct "XXH64_state_t" only via an opaque pointer 
Upstream recommends this whenever xxhash is linked dynamically:
https://github.com/Cyan4973/xxHash/issues/63#issuecomment-218376237

This change is required to unbundle xxhash in the next commit.
 2019-06-04 21:59:26 +02:00
Thomas Waldmann
42de5b9a79 location arg - should it be optional? fixes #4541. 
compact / config: yes, should be optional (can get repo from BORG_REPO
environment variable)

some debug commands: rather not, have non-optional addtl. posargs
 2019-06-04 19:36:20 +02:00
Thomas Waldmann
c0804ff5a2 argparser: always use REPOSITORY in metavar 
also: use more consistent help phrasing.
 2019-06-04 19:36:10 +02:00
Felix Schwarz
e6426d3386 setup.py: fix detection of missing Cython 
v2: use a list comprehension instead map() (suggested by Thomas Waldmann)
 2019-06-04 17:50:00 +02:00
TW
35373b8b93
Merge pull request #4600 from d7415/pattern_example 
Add example of exclude-norecurse rule in help patterns
 2019-06-02 22:06:54 +02:00
Martin Stone
883906939f
Add example of exclude-norecurse rule in help patterns 2019-06-02 18:46:03 +01:00
TW
0741093b54
Merge pull request #4593 from slokhorst/patch-1 
docs: update macOS Brew link
 2019-05-30 00:38:57 +02:00
Sebastiaan Lokhorst
8aafc622e7
docs: update macOS Brew link 2019-05-28 13:44:16 +02:00
TW
881f54a06a
Merge pull request #4585 from ThomasWaldmann/filter-selinux-xattrs 
filter out selinux xattrs, fixes #4574
 2019-05-21 22:36:00 +02:00
TW
537af85ace
Merge pull request #4586 from decentral1se/docsfix/point-to-related-software 
Add note for software for automating backup docs
 2019-05-21 22:25:58 +02:00
Luke Murphy
3f55841591
Add note for software for automating backup docs 
Closes https://github.com/borgbackup/borg/issues/4581.
 2019-05-21 12:48:03 +02:00
Thomas Waldmann
11bb4eb8fc filter out selinux xattrs, fixes #4574 2019-05-21 00:00:07 +02:00
TW
57c0103c32
Merge pull request #4570 from ThomasWaldmann/rename-fuse-based-test-master 
rename test_mount_hardlinks to test_fuse_mount_hardlinks (master)
 2019-05-16 05:30:06 +02:00
TW
5625b36c42
Merge pull request #4569 from ThomasWaldmann/filter-msgpack-warning-master 
pure-py msgpack warning shall not make a lot of tests fail, fixes #4558
 2019-05-16 02:10:32 +02:00
TW
92c9921468
Merge pull request #4568 from ThomasWaldmann/placeholder-in-comments-master 
enable placeholder usage in --comment, fixes #4559
 2019-05-16 01:40:16 +02:00
Thomas Waldmann
5e75c9ed86 rename test_mount_hardlinks to test_fuse_mount_hardlinks 
so both can be excluded by "not test_fuse"

(fedora does this for testing)
 2019-05-16 00:57:12 +02:00
Thomas Waldmann
cb4e602b34 pure-py msgpack warning shall not make a lot of tests fail, fixes #4558 
if the tests use a pure-python msgpack, 1 test which is specifically
made for that, will fail. esp. for linux distribution packages, this
will still point to the problem (that the msgpack package is not built
or installed correctly).
 2019-05-16 00:51:07 +02:00
Thomas Waldmann
eb16233a83 enable placeholder usage in --comment, fixes #4559 2019-05-16 00:40:31 +02:00
TW
6eabcda139
Merge pull request #4557 from atdt/patch-1 
Fix reference in FAQ
 2019-05-12 20:27:26 +02:00
Ori Livneh
92049f5405 Fix reference in FAQ 2019-05-12 13:35:31 -04:00
TW
320b935c97
Merge pull request #4528 from shawnl/back-port 
2 forward ports
 2019-05-12 19:09:44 +02:00
TW
2bc0b1e973
Merge pull request #4531 from ThomasWaldmann/whitelist-client-options 
use whitelist approach for borg serve, fixes #4097
 2019-05-11 23:42:47 +02:00
TW
839e92fc4b
Merge pull request #4539 from ThomasWaldmann/fix-extract-hardlinks 
slave hardlinks extraction issue, see #4350 (master)
 2019-05-11 22:14:40 +02:00
TW
70c049e5ae
Merge pull request #4551 from ThomasWaldmann/coverage-warning 
get rid of confusing coverage warning, fixes #2069
 2019-05-11 22:06:46 +02:00
TW
3a87e02fbb
Merge pull request #4548 from ThomasWaldmann/expand-glob-archives 
enable placeholder usage in --glob-archives, fixes #4495
 2019-05-11 21:29:36 +02:00
Thomas Waldmann
bd37c22149 get rid of confusing coverage warning, fixes #2069 2019-05-11 21:20:10 +02:00
Thomas Waldmann
cc41e36405 enable placeholder usage in --glob-archives, fixes #4495 
they are supported for --prefix already, so it totally makes sense to
also support them for the more powerful/generic --glob-archives.
 2019-05-09 20:28:41 +02:00
TW
fe2e9d77e2
Merge pull request #4544 from ThomasWaldmann/improve-compact 
small borg compact improvements, fixes #4522
 2019-05-07 14:42:48 +02:00