upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-01 07:05:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
5294 commits 10 branches 151 tags 72 MiB
Commit graph

5294 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tiago Donato
bc2642a0cd
Update documentation of borg create 
borg create examples within documentation mention 1.1 as a future version of borg.
 2019-07-17 10:55:24 -05:00
TW
0538dbfd64
Merge pull request #4668 from ThomasWaldmann/backports-1.1 
3 backports to 1.1
 2019-07-07 14:40:06 +02:00
Thomas Waldmann
b324f46aa1 vagrant: add up-to-date openindiana box (py35, openssl10) 2019-07-02 23:01:57 +02:00
Thomas Waldmann
4b97d80f9b how to supply a passphrase, use crypto devices, fixes #4549 2019-07-02 22:54:22 +02:00
Thomas Waldmann
21a819ef4a extract: document limitation "needs empty destination", fixes #4598 2019-07-02 22:53:45 +02:00
TW
b29dc81fa8
Merge pull request #4659 from ThomasWaldmann/pytest-failsafe-1.1 
cope with ANY error when importing pytest into borg.testsuite, #4652
 2019-07-02 22:47:42 +02:00
Thomas Waldmann
9cfba91cc6 cope with ANY error when importing pytest into borg.testsuite, #4652 
this happened because the user had pytest5 installed somehow,
although it is incompatible with python 3.4:

# python3 /usr/local/bin/borg --version
Traceback (most recent call last):
  File "/usr/local/lib/python3.4/dist-packages/borg/archiver.py", line 81, in <module>
    from .selftest import selftest
  File "/usr/local/lib/python3.4/dist-packages/borg/selftest.py", line 21, in <module>
    from .testsuite.hashindex import HashIndexDataTestCase, HashIndexRefcountingTestCase, HashIndexTestCase
  File "/usr/local/lib/python3.4/dist-packages/borg/testsuite/__init__.py", line 29, in <module>
    from pytest import raises
  File "/usr/local/lib/python3.4/dist-packages/pytest.py", line 6, in <module>
    from _pytest.assertion import register_assert_rewrite
  File "/usr/local/lib/python3.4/dist-packages/_pytest/assertion/__init__.py", line 6, in <module>
    from _pytest.assertion import rewrite
  File "/usr/local/lib/python3.4/dist-packages/_pytest/assertion/rewrite.py", line 443, in <module>
    ast.MatMult: "@",
AttributeError: 'module' object has no attribute 'MatMult'
 2019-07-01 21:26:04 +02:00
TW
737869449c
Merge pull request #4658 from emichael/1.1-maint 
1.1-maint: Fix invalid archive error message
 2019-07-01 19:54:55 +02:00
Ellis Michael
aac005d7b4
Fix invalid archive error message 
Backporting b6a7a0806e to 1.1-maint
 2019-07-01 10:18:53 -07:00
TW
22c9c19de2
Merge pull request #4653 from ThomasWaldmann/fix-positional-preload-1.1 
fix preloading for old remote servers, fixes #4652
 2019-06-30 23:39:42 +02:00
Thomas Waldmann
2574f4dac5 fix preloading for old remote servers, fixes #4652 
if the remote server does not support the dict-based argument passing
yet (e.g. when accidentally using borg 0.29 on rsync.net), the GET rpc
call argument list failed to generate if the command currently being
processed was not a GET also.

note: rsync.net has a more recent borg as "borg1".
 2019-06-28 21:10:58 +02:00
TW
e1b4c1d27b
Merge pull request #4650 from thiagomacieira/fiz-zlib-bad-assumption-1.1 
Fix zlib bad assumption
 2019-06-28 19:28:30 +02:00
Thiago Macieira
289b1279f9 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>
(cherry picked from commit 575a348ce4)
 2019-06-28 08:28:49 -07:00
TW
52c6b92598
Merge pull request #4637 from elho/second-archive-placeholder-maint 
Enable placeholder usage in all extra archive arguments
 2019-06-24 09:58:22 +02:00
TW
9cc680eda3
Merge pull request #4642 from russelldavis/fix-osxfuse-link-1.1-maint 
Fix osxfuse github link in installation docs (1.1 backport)
 2019-06-24 09:56:04 +02:00
Russell Davis
feff9dfa43 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-24 00:47:57 -07:00
Elmar Hoffmann
1d1a2daaf9 enable placeholder usage in all extra archive arguments 2019-06-23 13:57:17 +02:00
TW
4ee7fb7595
Merge pull request #4633 from elho/docs-typofix-maint 
Documentation spelling fix
 2019-06-22 18:18:25 +02:00
Elmar Hoffmann
584367a119 fix spelling 2019-06-22 18:03:57 +02:00
TW
2f7f3b854f
Merge pull request #4617 from ThomasWaldmann/use-borg-repo-1.1 
use borg_repo (1.1-maint backport)
 2019-06-10 23:20:49 +02:00
TW
eaa93e3163
Merge pull request #4618 from ThomasWaldmann/filter-selinux-xattrs-1.1 
filter out selinux xattrs, fixes #4574 (1.1-maint backport)
 2019-06-10 22:33:23 +02:00
Thomas Waldmann
472bcf507c filter out selinux xattrs, fixes #4574 2019-06-10 21:01:47 +02:00
Thomas Waldmann
38ce5dc005 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-10 20:55:55 +02:00
Thomas Waldmann
9ee04cb886 argparser: always use REPOSITORY in metavar 
also: use more consistent help phrasing.
 2019-06-10 20:46:00 +02:00
TW
bf496d5a66
Merge pull request #4615 from ThomasWaldmann/fix-4607-extract-hl-crash-1.1 
extract: fix KeyError for "partial" extraction
 2019-06-10 19:41:33 +02:00
Thomas Waldmann
16f9d45209 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 18:23:28 +02:00
TW
b2ea4e77ee
Merge pull request #4609 from ThomasWaldmann/1.1-fixes 
cosmetic fixes (1.1)
 2019-06-09 14:41:24 +02:00
Thomas Waldmann
f072a3579e remove superfluous whitespace in docs 2019-06-08 17:56:58 +02:00
TW
e6e8f570f4
Merge pull request #4601 from d7415/pattern_example_1.1 
Add example of exclude-norecurse rule in help patterns
 2019-06-03 11:48:05 +02:00
Martin Stone
38d971ac43
Add example of exclude-norecurse rule in help patterns 2019-06-02 20:44:55 +01:00
TW
8e6773265c
Merge pull request #4596 from slokhorst/brew-link-1.1-maint 
docs: update macOS Brew link (1.1-maint)
 2019-05-30 16:10:26 +02:00
Sebastiaan Lokhorst
89d564d427 docs: update macOS Brew link 2019-05-30 09:32:46 +02:00
TW
da28d8e7a3
Merge pull request #4588 from decentral1se/docsfix/point-to-related-software-1.1-maint 
Add note for software for automating backup docs
 2019-05-22 11:25:12 +02:00
Luke Murphy
878edc8d8b
Add note for software for automating backup docs 
Closes https://github.com/borgbackup/borg/issues/4581.
 2019-05-22 11:01:39 +02:00
TW
78cda685f2
Merge pull request #4576 from FelixSchwarz/add-msgpack-to-authors 
AUTHORS: mention copyright+license for bundled msgpack
 2019-05-16 11:48:58 +02:00
Felix Schwarz
fa5590507b AUTHORS: mention copyright+license for bundled msgpack 2019-05-16 11:34:38 +02:00
TW
4984ccd431
Merge pull request #4572 from borgbackup/rel1110 
release 1.1.10
 2019-05-16 05:29:35 +02:00
Thomas Waldmann
aefe327ed0 build_man 2019-05-16 02:37:58 +02:00
Thomas Waldmann
2f1f73c92c build_usage 2019-05-16 02:37:58 +02:00
Thomas Waldmann
d9288797b5 update CHANGES (1.1-maint) 2019-05-16 02:37:58 +02:00
Thomas Waldmann
20d3435e1b vagrant: use python 3.5.7 for build 2019-05-16 02:37:58 +02:00
Thomas Waldmann
c0f879f1d0 upgrade osxfuse from 3.8.2 to 3.8.3 2019-05-16 02:33:47 +02:00
TW
87827b7443
Merge pull request #4567 from ThomasWaldmann/rename-fuse-based-test 
rename fuse based test
 2019-05-16 01:11:19 +02:00
Thomas Waldmann
be16b167ea 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:17:19 +02:00
TW
ddf615149a
Merge pull request #4560 from ThomasWaldmann/bundle-msgpack 
Bundle msgpack
 2019-05-15 21:16:26 +02:00
TW
0f6aa52106
Merge pull request #4564 from ThomasWaldmann/placeholders-in-comments 
enable placeholder usage at some places
 2019-05-14 21:35:03 +02:00
Thomas Waldmann
7f0e07603e enable placeholder usage in --comment, fixes #4559 2019-05-14 14:51:57 +02:00
Thomas Waldmann
fb05da42cf 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-14 14:31:37 +02:00
Thomas Waldmann
fee6b5ded4 add msgpack license to docs/3rd_party/msgpack 2019-05-14 00:23:13 +02:00
Thomas Waldmann
5fa05ffed9 move msgpack hints to helpers.py 
also remove msgpack from install_requires - by default we use the
bundled code now.
 2019-05-14 00:00:47 +02:00