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

3239 Commits

Author SHA1 Message Date
enkore ddb8839076 Merge pull request #1845 from enkore/merge/1.0-maint 
merge 1.0-maint
 2016-11-13 17:53:46 +01:00
Marian Beermann dfd748689c test_attic013_acl_bug: use def instead of lambda 2016-11-13 17:30:42 +01:00
Marian Beermann c2eb2539b9
Document maintenance merge command 2016-11-13 16:07:06 +01:00
Marian Beermann 0d2b76fa7d Merge branch '1.0-maint' into merge/1.0-maint 2016-11-13 15:58:42 +01:00
enkore 4b5a17c096 Merge pull request #1841 from enkore/issue/1837 
Fix check incorrectly reporting attic 0.13 and earlier archives as corrupt
 2016-11-13 15:26:19 +01:00
Marian Beermann a898297669
check: improve "did not get expected metadata dict" diagnostic 2016-11-13 15:25:40 +01:00
Marian Beermann 639eba1635 Fix check incorrectly reporting attic 0.13 and earlier archives as corrupt 2016-11-13 15:25:10 +01:00
TW 9b1241eecd Merge pull request #1844 from enkore/issue/1815 
check: catch two kinds of different repos
 2016-11-13 14:44:17 +01:00
Marian Beermann 2261709e78
check: handle repo w/o objects gracefully 
normal check would complete, --repair would crash when trying
to write the rebuilt (empty) manifest out, since self.key was None
 2016-11-13 11:45:42 +01:00
Marian Beermann 64a3fa8e73 check: bail out early if repository is *completely* empty 2016-11-13 11:40:19 +01:00
enkore 3789c78f60 Merge pull request #1843 from enkore/issue/1801 
Fix tox/pybuild in 1.0-maint
 2016-11-13 11:32:08 +01:00
Marian Beermann 960c42193a
fix tox build for environment-python != containing-python in yet-another instance 
this instance: the repository worktree is *not* named borg.

Cherry pick of 4f1157c into 1.0-maint due to f3efcdb

TODO removed since we already did that after 1.0-maint, but 1.0-maint
will never receive the change.
 2016-11-13 11:20:00 +01:00
enkore 1a0218b50f Merge pull request #1840 from ThomasWaldmann/fix-logger 
at xattr module import time, loggers are not initialized yet
 2016-11-13 02:05:06 +01:00
Thomas Waldmann 3237db4621 at xattr module import time, loggers are not initialized yet 2016-11-12 23:10:40 +01:00
TW 5c98b850dc Merge pull request #1839 from ThomasWaldmann/osxfuse-non-beta 
osxfuse non-beta
 2016-11-12 23:04:50 +01:00
Thomas Waldmann cd8dfda318 caskroom osxfuse-beta gone, it's osxfuse now (3.5.3) 2016-11-12 23:02:13 +01:00
TW f568244a98 Merge pull request #1836 from enkore/f/smfsc 
repository: check_free_space, special case small repos
 2016-11-12 22:55:21 +01:00
Marian Beermann 00fae3f3e3
repository: check_free_space, special case small repos 2016-11-12 14:42:13 +01:00
enkore 80b86709ef Merge pull request #1833 from enkore/issue/1821 
borg init: fix free space check crashing if disk is full
 2016-11-12 01:23:34 +01:00
enkore e26348a055 Merge pull request #1834 from enkore/issue/1813 
Clarify cache/repository README file
 2016-11-11 21:25:30 +01:00
Marian Beermann bd4a0fe23b
Clarify cache/repository README file 2016-11-11 21:24:17 +01:00
enkore 01e56a8650 Merge pull request #1835 from enkore/f/sch-master 
debug, key: enable --help
 2016-11-11 19:55:48 +01:00
Marian Beermann ac5f9b61ec
debug, key: enable --help 
A small merge mishap in 2a864be8; 1.0-maint has it correctly.
 2016-11-11 19:54:11 +01:00
Marian Beermann 6c955579a8 repository: test_additional_free_space, assert it still exists 2016-11-11 16:39:11 +01:00
Marian Beermann 5b31a2cd61
borg init: fix free space check crashing if disk is full 2016-11-11 16:21:05 +01:00
enkore 223f7890fe Merge pull request #1819 from enkore/issue/1800 
Add BLAKE2b key types
 2016-11-11 03:11:38 +01:00
Marian Beermann a31ca4f022
crypto: link against system libb2, if possible 2016-11-11 03:08:11 +01:00
Marian Beermann 05ce8e0ff9 Add test script for blake2b_256 against CPython 3.6 hashlib 2016-11-11 03:07:05 +01:00
Marian Beermann 76c93bb80b crypto blake2: don't release the GIL during key hashing 2016-11-11 03:07:05 +01:00
Marian Beermann 00ac7b14be Add BLAKE2b key types 2016-11-11 03:07:05 +01:00
TW 19f6f7f146 Merge pull request #1830 from languitar/1.0-maint 
Clarify prune behavior for different archive contents
 2016-11-10 21:17:13 +01:00
Johannes Wienke 3ee019761a Clarify prune behavior for different archive contents 
In the online help, explain that archives with different contents need to be
separated via the prefix when pruning to achieve a desired retention policy per
archive set.

Relates to #1824.
 2016-11-10 19:40:15 +01:00
enkore 5fecac63a9 testsuite/archiver: fix missing newline before RemoteArchiverTestCase 2016-11-10 17:35:59 +01:00
TW dc4325be25 Merge pull request #1826 from textshell/feature/repository-cleanup-rollback-api 
Repository: rollback's cleanup parameter is internal.
 2016-11-10 17:24:01 +01:00
enkore b026c8d0ec Merge pull request #1827 from textshell/feature/gitattribute-diff-python 
.gitattributes: Set python diff mode for all *.py files.
 2016-11-10 16:59:59 +01:00
Martin Hostettler 74ab7f1f61 .gitattributes: Set python diff mode for all *.py files. 2016-11-10 16:48:35 +01:00
Martin Hostettler 79c77e7a68 Repository: rollback's cleanup parameter is internal. 2016-11-10 13:44:58 +01:00
TW 0cf4a16c5f Merge pull request #1818 from enkore/merge/1.0-maint 
merge 1.0-maint
 2016-11-10 02:24:24 +01:00
Marian Beermann 09f470bd85 Add crypto.blake2b_256 2016-11-10 00:06:50 +01:00
Marian Beermann 05a52ec8ec
Merge branch '1.0-maint' into merge/1.0-maint 2016-11-09 23:56:54 +01:00
enkore cf44954c34 Merge pull request #1674 from enkore/f/stale-lock-murderer 
Automatically remove stale locks
 2016-11-07 21:58:34 +01:00
Marian Beermann 676e69cac4 Parse & pass BORG_HOSTNAME_IS_UNIQUE env var to enable stale lock killing 2016-11-07 21:56:40 +01:00
Marian Beermann cc14975f2d Add tests for stale lock killing and platform.process_alive 2016-11-07 21:56:07 +01:00
Marian Beermann 2bd8ac7762 platform: bump API version (and check consistency) 2016-11-07 21:54:16 +01:00
Marian Beermann 7930d055ec import platform module instead of functions 
(testability)
 2016-11-07 21:54:16 +01:00
Marian Beermann 8e1df7a364 Use logging instead of prints 2016-11-07 21:54:16 +01:00
Marian Beermann c562f7750c Move platform-dependent code to platform package 2016-11-07 21:54:16 +01:00
Oleg Drokin d490292be3 Detect and delete stale locks when it's safe 
If BORG_UNIQUE_HOSTNAME shell variable is set, stale locks
in both cache and repository are deleted.

Stale lock is defined as a lock that's originating from the same
hostname as us, and correspond to a pid that no longer exists.

This fixes #562
 2016-11-07 21:54:16 +01:00
TW cc499fe7f9 Merge pull request #1791 from ThomasWaldmann/vagrant-llfuse-build 
vagrant: remove llfuse from tox.ini at a central place
 2016-11-05 14:25:10 +01:00
TW 19891d655b Merge pull request #1792 from ThomasWaldmann/cygwin-no-remote-archiver-tests 
skip remote tests on cygwin
 2016-11-05 14:24:34 +01:00