mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
5,067 Commits 9 Branches 137 Tags 57 MiB
Commit Graph

5067 Commits

Author SHA1 Message Date
Thomas Waldmann d533f4d691 use own openindiana box 
the one on vagrantcloud is not very recent...
 2018-08-11 17:50:34 +02:00
TW 84b063cb21
Merge pull request #4037 from ThomasWaldmann/vagrant-py356 
vagrant: use python 3.5.6 (1.1-maint)
 2018-08-11 16:51:35 +02:00
Thomas Waldmann 6fe6abc0da vagrant: use python 3.5.6 (1.1-maint) 2018-08-11 16:49:54 +02:00
TW feaeb7ba98
Merge pull request #4035 from ThomasWaldmann/osxfuse382 
vagrant: use osxfuse 3.8.2
 2018-08-11 14:33:24 +02:00
Thomas Waldmann 799d7b5904 vagrant: use osxfuse 3.8.2 2018-08-11 14:27:31 +02:00
TW a0cd7627bc
Merge pull request #4034 from newtonne/fix-man-table-1.1 
Remove row/column-spanning from docs source, fixes #4000
 2018-08-11 14:04:53 +02:00
newtonne f2f9838201 Remove row/column-spanning from docs source, fixes #4000 
Sphinx doesn't support row or column-spanning, which caused the content
of the additional features table to be incorrect. To fix this, we now
define the content of each cell explicitly.

This change also fixes #3990.

(cherry picked from commit 11a2f1f684)
 2018-08-11 10:58:30 +01:00
TW 855ae3f7ee
Merge pull request #4025 from ThomasWaldmann/fix-cachedir-1.1 
don't archive tagged dir when recursing an excluded dir, fixes #3991
 2018-08-09 15:33:37 +02:00
TW a38bdd7090
Merge pull request #4023 from ThomasWaldmann/hostname-fqdn-cleanups-1.1 
call socket.gethostname only once
 2018-08-09 13:28:00 +02:00
TW 059ad8d8ae
Merge pull request #4021 from ThomasWaldmann/init-warning-1.1 
init: add warning to store both key and passphrase at safe place(s)
 2018-08-09 09:29:11 +02:00
Thomas Waldmann 0fa63d9bac don't archive tagged dir when recursing an excluded dir, fixes #3991 
if we are recursing an explicitly excluded directory, we are only
looking for explicitly included items, but we do not need to archive
tagged directories or the tag files themselves - they are all excluded
by the explicit exclusion already.

for performance reasons, we still determine whether a directory is
tagged and if it is, we do not recurse into it as there can't be any
included items in there.

(cherry picked from commit 8256c26cf2)
 2018-08-09 09:25:32 +02:00
Thomas Waldmann 382e37feb7 call socket.gethostname only once 
(cherry picked from commit d2e2f1b89d)
 2018-08-09 09:08:43 +02:00
TW 48ed187279
Merge pull request #4020 from ThomasWaldmann/machine-id-1.1 
add BORG_HOST_ID, fixes #3985
 2018-08-09 09:01:15 +02:00
TW 105a23ac0e
Merge pull request #4019 from ThomasWaldmann/py37-1.1 
Py37 (1.1 backport)
 2018-08-09 08:38:00 +02:00
Thomas Waldmann d21da08f85 init: add warning to store both key and passphrase at safe place(s) 
(cherry picked from commit 4b31ad123f)
 2018-08-09 08:22:00 +02:00
Thomas Waldmann 901e3a7888 add BORG_HOST_ID, fixes #3985 
(cherry picked from commit 90348c1de9)
 2018-08-09 08:11:05 +02:00
Thomas Waldmann 2cbfd54490 travis: reorder envs, remove 3.6-dev 
flake8 first, 34/35/36/37 linux, 34/35/36 osx

also remove quotes around version number, not needed for 3.7.
 2018-08-09 08:04:38 +02:00
Thomas Waldmann ad6bb9cd1e add python 3.7 to pypi metadata 
(cherry picked from commit 751cd2caed)
 2018-08-09 07:59:03 +02:00
Thomas Waldmann 836dc0b568 tox / travis: enable testing on py37 
(cherry picked from commit fef9581690)
 2018-08-09 07:57:56 +02:00
Thomas Waldmann 02dbe5fd5c argparse: work around bad default in py 3.7.0a/b/rc, fixes #3996 
(cherry picked from commit 52f1cd4bc6)
 2018-08-09 07:52:37 +02:00
TW 64f2fc0a65
Merge pull request #3824 from ThomasWaldmann/finding-pieces 
some more debug commands
 2018-08-09 07:27:54 +02:00
Thomas Waldmann 24812b0317 dump-repo-objs: filename layout improvements 2018-08-09 06:49:48 +02:00
Thomas Waldmann 8738e85967 implement borg debug dump-repo-objs --ghost 
intended as a last resort measure to export all segment file contents
in a relatively easy to use format.

if you want to dig into a damaged repo (e.g. missing segment files,
missing commits) and you know what you do.

note: dump-repo-objs --ghost must not use repo.list()

because this would need the repo index and call get_transaction_id and
check_transaction methods, which can easily fail on a damaged repo.

thus we use the same low level scan method as we use anyway to get
some encrypted piece of data to setup the decryption "key".
 2018-08-09 06:49:48 +02:00
Thomas Waldmann 2b7d65b024 use repository.scan() for dump-repo-objs to get on-disk order 
it is also more efficient, avoids random access.
 2018-08-09 06:49:48 +02:00
Thomas Waldmann c2ed0d9ee0 implement borg debug search-repo-objs searchterm 2018-08-09 06:49:48 +02:00
TW b951a2ee42
Merge pull request #3997 from ThomasWaldmann/py37-1.1 
remove loggerDict.clear() from tearDown method, fixes #3805
 2018-07-29 13:54:40 +01:00
Thomas Waldmann a9d523d6d8 remove loggerDict.clear() from tearDown method, fixes #3805 
It causes problems with the new caching in the py37 logger module.

Removing loggerDict.clear() fixes this and makes the tests work again.
Also, it does not seem to have any negative effect, neither on py36
nor on py37.

See also: https://bugs.python.org/issue34269
 2018-07-29 12:43:06 +01:00
TW 39c7bd90f1
Merge pull request #3989 from margau/1.1-maint 
Backport of #3987 into 1.1-maint
 2018-07-20 16:59:06 +02:00
Marvin Gaube 1c250ae39c
Backport of #3987 
Backport of https://github.com/borgbackup/borg/pull/3987
 2018-07-20 16:25:17 +02:00
TW 5e3f62f95b
Merge pull request #3982 from ThomasWaldmann/locking-fixes-1.1 
Locking: better logging, some asserts (1.1)
 2018-07-17 19:04:16 +02:00
Thomas Waldmann f86bf8a0a8 locking: more logging 2018-07-17 00:18:57 +02:00
Thomas Waldmann 2bf1b29e8e process_alive: add some assertions 2018-07-17 00:18:57 +02:00
TW ab0da76c5d
Merge pull request #3981 from ThomasWaldmann/fix-cache-lock-timeout-1.1 
cache lock: use lock_wait everywhere to fix infinite wait
 2018-07-16 23:48:26 +02:00
Thomas Waldmann 2f3e60d9d5 cache lock: use lock_wait everywhere to fix infinite wait 
also: clarify docs
 2018-07-15 10:51:40 +02:00
TW 98b8d77788
Merge pull request #3979 from ThomasWaldmann/fix-nanorst-1.1 
nanorst: add missing blank to exception message (1.1 bp)
 2018-07-13 11:38:35 +02:00
Thomas Waldmann 223e739c0a nanorst: add missing blank to exception message 
(cherry picked from commit 0d06407087)
 2018-07-13 10:44:17 +02:00
TW 9db024c884
Merge pull request #3973 from ThomasWaldmann/fix-ext-version-check-1.1 
fix logic bug in platform module API version check (1.1 bp)
 2018-07-08 15:12:00 +02:00
Thomas Waldmann 5c71c4f990 fix logic bug in platform module API version check 
(cherry picked from commit 2bb23f00af)
 2018-07-08 14:53:00 +02:00
TW 480e5402ba
Merge pull request #3966 from russelldavis/mac-docs-1.1 
Update installation instructions for macOS (1.1 backport)
 2018-07-07 20:02:32 +02:00
Russell Davis 3a27d29bea Update installation instructions for macOS 
- Updated `OS X` to the new `macOS` name
- Fuse 3.x is no longer just a prerelease
- Added instructions to install fuse via homebrew
 2018-07-07 10:21:19 -07:00
TW 874e6b8971
Merge pull request #3958 from ThomasWaldmann/fix-acl-proto-1.1 
acl platform code: fix acl set return type (1.1-maint)
 2018-07-05 23:40:57 +02:00
Thomas Waldmann 30509b74b0 acl platform code: fix acl set return type (1.1-maint) 2018-07-05 22:55:17 +02:00
TW 59ba6f82be
Merge pull request #3950 from ThomasWaldmann/fix-xattr-ctypes 
Fix xattr ctypes
 2018-07-05 11:01:38 +02:00
Thomas Waldmann 71b02912c9 xattr: add linux {list,get,set}xattr ctypes prototypes 2018-07-03 22:32:37 +02:00
Thomas Waldmann 2d37c9d3f9 xattr: fix darwin flistxattr ctypes prototype 2018-07-03 22:29:35 +02:00
TW f996986f44
Merge pull request #3940 from ThomasWaldmann/issue-3494 
trying to debug #3494 on travis
 2018-06-30 23:22:23 +02:00
Thomas Waldmann 2d490aa8c8 tests: trying to debug test fails on travis, #3494 
- reordered code a little, so files are touched in different order

let's see if this changes anything.

- create_regular_file: giving size AND contents is not supported

the code did not create a 4096 bytes long file, but just a 1 byte
long file. adding an assertion to avoid unsupported usage.
 2018-06-30 22:02:10 +02:00
TW bed0e81e27
Merge pull request #3936 from ThomasWaldmann/less-random-1.1 
tests: fetch less data via os.urandom
 2018-06-29 18:01:10 +02:00
Thomas Waldmann 49b681dd11 tests: fetch less data via os.urandom 
freebsd12 is unhappy with having to deliver 50MiB random in one go
and fails with BlockingIOError "temporary unavailable" when trying.

for test_lz4_buffer_allocation, it is good enough to fetch 5MiB and
concatenate that 10 times.

(cherry picked from commit acb15fd960)
 2018-06-29 13:46:41 +02:00
TW 3623cefc4f
Merge pull request #3929 from saurvs/doc_backport 
docs: add link to tempfile module (backport)
 2018-06-26 14:05:14 +02:00