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

2884 Commits

Author SHA1 Message Date
Marian Beermann 517ccc2d58 ProgressIndicatorPercent: output(message) to override output 2016-08-26 22:15:29 +02:00
enkore 47404dfde5 Merge pull request #1526 from textshell/fix/preload-leak-hardlink 
extract: When doing a partial restore don't leak prefetched chunks.
 2016-08-26 22:06:48 +02:00
Marian Beermann cd39ccb821 fix overeager storing of hardlink masters 
n.b. we only need to store them for items that we wouldn't extract.

this also fixes an intersting edge case in extracting hard links
with --strip-components
 2016-08-25 21:16:20 +02:00
Marian Beermann b5d7f1df26 extract: fix incorrect progress output for hard links 
this produces correct output if any (non proper) subset of hardlinks are
extracted.
 2016-08-25 01:12:30 +02:00
TW 316ad336c7 Merge pull request #1523 from ThomasWaldmann/use-prebuilt-bootloader 
Vagrant: pyinstaller: use pre-built linux bootloaders, fixes #1506
 2016-08-24 00:24:33 +02:00
TW a54205d696 Merge pull request #1528 from svx/master 
Addjust border color
 2016-08-23 14:55:56 +02:00
sven ff04c059b7 Addjust border color 
This changes the border-color to match with the background-color
 2016-08-23 14:27:26 +02:00
Martin Hostettler b845a074cb tests: TestBuildFilter: Adjust from item_is_hardlink_master to peek_and_store_hardlink_masters. 2016-08-22 23:36:43 +02:00
Martin Hostettler a026febdb0 Archiver.build_filter: strip_components is no longer a optional parameter. 2016-08-22 23:07:38 +02:00
Martin Hostettler 972392e290 extract: When doing a partial restore don't leak prefetched chunks. 
The filter function passed to iter_items (with preload=True) may never return True for items that
are not really extracted later because that would leak prefetched items.

For restoring hard linked files the item containing the actual chunks might not be matched
or implicitly removed from the restore by strip_components. For this reason the chunk list or all
items that can potentially be used as hardlink target needs to be stored.

To achive both requirements at the same time the filter function needs to store the needed information
for the hardlinks while not returning True just because it could be a hardlink target.

Known problems: When using progress indication the calculated extracted_size now can be smaller
than the actual extracted size in presence of hard links (master is not restored) instead of
bigger (potential master not used in restore).
 2016-08-22 22:58:58 +02:00
Thomas Waldmann 2cfd905347 Vagrant: pyinstaller: use pre-built linux bootloaders, fixes #1506 2016-08-22 18:49:03 +02:00
TW e0b8635098 Merge pull request #1521 from ThomasWaldmann/fix-coverage 
fix .coverage processing
 2016-08-22 01:37:43 +02:00
Thomas Waldmann 85311f0116 fix .coverage processing 2016-08-22 01:15:03 +02:00
enkore 3f5f27fbfe Merge pull request #1520 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0 maint
 2016-08-22 00:36:13 +02:00
Thomas Waldmann 6da34fcc5a add debug-info usage help file 2016-08-22 00:14:11 +02:00
Thomas Waldmann d1d2738381 re-enable fuse tests for RemoteArchiver 
at some time they had deadlock issues, but it worked for me now.
 2016-08-22 00:14:10 +02:00
Thomas Waldmann ebe1143570 travis: test fuse-enabled borg 2016-08-22 00:14:08 +02:00
Thomas Waldmann 2a41569fec use trusty for testing, to have a recent FUSE 2016-08-22 00:12:57 +02:00
Carlo Teubner 3f30649a85 internals.rst: fix typos 2016-08-22 00:10:49 +02:00
TW 5859badc29 Merge pull request #1519 from enkore/issue/1115 
Repository: add compact_segments progress
 2016-08-21 22:54:58 +02:00
Marian Beermann 53d0140bd5 Repository: add compact_segments progress 2016-08-21 21:55:53 +02:00
TW 2f65f7bdec Merge pull request #1449 from enkore/f/extractprogress 
extract --progress
 2016-08-21 20:24:44 +02:00
enkore ed6a054310 Merge pull request #1516 from sudoman/sudoman-doc-changes-0 
added doc for "pull" type backup over sshfs
 2016-08-21 20:19:29 +02:00
Marian Beermann ab31ffaa85 ProgressIndicatorPercent: remove same_line 2016-08-21 19:57:36 +02:00
Marian Beermann e7d44cec39 extract: --progress: Calculating size 2016-08-21 19:57:36 +02:00
TW ab96c6496c Merge pull request #1513 from ThomasWaldmann/improve-error-logging 
improve error logging, fixes #1440
 2016-08-21 18:29:18 +02:00
Andrew Engelbrecht f8bb73732c added doc for "pull" type backup over sshfs 
Fixes #900
 2016-08-21 01:04:16 -04:00
Marian Beermann 4d214e2503 Simplify and test Item.file_size 2016-08-21 01:09:21 +02:00
Marian Beermann 5924915d35 Flip ProgressIndicatorPercent same_line default to True 
Every production use of this uses same_line=True
 2016-08-21 01:09:20 +02:00
Marian Beermann 8709cec57c borg-extract --progress 2016-08-21 01:07:55 +02:00
enkore 81dd381701 Merge pull request #1507 from ThomasWaldmann/use-modified-pyinstaller 
use patched LDLP-preserving pyinstaller
 2016-08-21 00:16:24 +02:00
enkore 9baa024f4a Merge pull request #1508 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0 maint
 2016-08-21 00:12:00 +02:00
Thomas Waldmann 41e4707d6a fixup: meant "tb", not "traceback" 2016-08-20 23:09:42 +02:00
TW 357f4ef72e Merge pull request #1511 from c4rlo/lru-cache 
helpers.py: replace memoize with functools.lru_cache
 2016-08-20 21:19:17 +02:00
Thomas Waldmann a0c8c40f27 improve error logging, fixes #1440 
archiver: split traceback and msg, have separate log level for traceback, log LockTimeout at debug level,
for "Error" exceptions: always log the traceback, either at ERROR or DEBUG level.

remote: if we have an "Error" typed exception instance, we can use its traceback flag and .get_message()
as we do locally.
 2016-08-20 17:23:02 +02:00
Carlo Teubner 61af307ad4 helpers.py: replace memoize usages with lru_cache 2016-08-20 13:06:16 +01:00
Thomas Waldmann e7fccaccb2 restore original LDLP, if possible, fixes #1498 
see https://github.com/pyinstaller/pyinstaller/pull/2148
 2016-08-20 12:31:23 +02:00
Thomas Waldmann 821fba8cb0 use patched LDLP-preserving pyinstaller, fixes #1416 
see https://github.com/pyinstaller/pyinstaller/pull/2148

also: use waf --no-lsb (the bootloader does not build without it on our wheezy32 vagrant VM)
 2016-08-20 12:30:26 +02:00
TW 12ea5d01cb Merge pull request #1510 from c4rlo/os-devnull 
daemonize(): use os.devnull instead of hardcoded /dev/null
 2016-08-20 11:46:03 +02:00
Carlo Teubner 28076ee588 helpers.py: replace memoize with functools.lru_cache 2016-08-20 10:01:59 +01:00
Carlo Teubner 13761c4ec2 daemonize(): use os.devnull instead of hardcoded /dev/null 2016-08-20 10:00:03 +01:00
Thomas Waldmann c355f3617a Merge branch '1.0-maint' 2016-08-20 00:04:55 +02:00
enkore 45fd66f6e1 Merge pull request #1505 from ThomasWaldmann/test-list-format-depr 
borg list: test for --list-format deprecation
 2016-08-19 15:22:31 +02:00
Thomas Waldmann 53d14e96de borg list: test for --list-format deprecation 2016-08-19 14:55:49 +02:00
TW 32e84f33e9 Merge pull request #1484 from enkore/issue/1396 
Track shadowing of log entries
 2016-08-19 14:09:34 +02:00
Thomas Waldmann f32c8858ad update CHANGES with description of issue #1428 2016-08-18 23:22:50 +02:00
Thomas Waldmann dde18d6a76 security fix: --restrict-to-path must not accept pathes with same name prefix 
bug: --restrict-to-path /foo  erroneously allowed  /foobar.
even worse: --restrict-to-path /foo/  erroneously allowed  /foobar.
 2016-08-18 22:40:50 +02:00
Thomas Waldmann 28cbf24815 more tests for --restrict-to-path 
especially test that other directory names sharing same name prefix are not allowed.
 2016-08-18 22:40:50 +02:00
TW cba0c3dc59 Merge pull request #1483 from ThomasWaldmann/update-1.0-changes 
WIP: update CHANGES (1.0-maint)
 2016-08-18 22:17:18 +02:00
Thomas Waldmann 2aae0b17c6 update CHANGES 2016-08-18 22:15:30 +02:00