upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-11 09:59:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
2474 commits 10 branches 151 tags 57 MiB
Commit graph

2474 commits

This branch
This branch
All branches
Author SHA1 Message Date
enkore
69f73b1752 Merge pull request #1227 from ThomasWaldmann/checkpoint-interval 
increase checkpoint-interval default from 300 to 1800s, fixes #896
 2016-06-30 17:09:56 +02:00
Thomas Waldmann
87d6755108 Merge branch '1.0-maint' 2016-06-29 18:28:33 +02:00
enkore
124265330f Merge pull request #1216 from ThomasWaldmann/read-special-follow-symlink 
in --read-special mode, follow symlinks, fixes #1215
 2016-06-29 17:12:11 +02:00
enkore
67c69998d6 Merge pull request #1211 from enkore/issue/1138 
Fix incorrect propagation of OSErrors in create code
 2016-06-29 17:07:51 +02:00
enkore
b0eb1af6ea Merge pull request #1218 from ThomasWaldmann/fix-vagrant-openbsd 
Vagrantfile: use openbsd 5.9, fixes #716
 2016-06-29 17:00:47 +02:00
enkore
523ea295d2 Merge pull request #1212 from ThomasWaldmann/prune-example 
add prune visualization / example, fixes #723
 2016-06-29 16:57:43 +02:00
Thomas Waldmann
e81fc4381c Vagrantfile: use openbsd 5.9, fixes #716 
machine already has python3.4.
rsync works now.
fuse does not work on openbsd (and breaks borg install, if tried).
 2016-06-29 01:04:24 +02:00
Thomas Waldmann
c3073bacbb in --read-special mode, follow symlinks, fixes #1215 2016-06-28 18:49:51 +02:00
Marian Beermann
e96905c6b1
Fix error swallowing of ignored responses in RPC code 2016-06-27 22:45:44 +02:00
Marian Beermann
431441f0d6 input_io_* tests 2016-06-27 22:00:24 +02:00
Thomas Waldmann
c773c882b9 add prune visualization / example, fixes #723 2016-06-27 21:20:35 +02:00
Marian Beermann
5b453856ec
Fix incorrect propagation of OSErrors in create code 2016-06-27 20:56:41 +02:00
Thomas Waldmann
c201654f45 increase checkpoint-interval default from 300 to 1800s, fixes #896 
doing a checkpoint can be expensive, if the repo connection is slow and/or
accessed via a network filesystem and/or the repo is large.

thus: don't do it too often.
 2016-06-27 20:05:20 +02:00
TW
49feacfab1 Merge pull request #1210 from ThomasWaldmann/build-binaries-with-3.5.2 
use python 3.5.2 to build the binaries
 2016-06-27 19:55:23 +02:00
Thomas Waldmann
c6a72bb16f use python 3.5.2 to build the binaries 2016-06-27 18:42:12 +02:00
TW
6a5121a1d5 Merge pull request #1207 from ThomasWaldmann/issue-1205 
use bytes type for ACL attributes, fixes #1205
 2016-06-27 17:22:12 +02:00
Thomas Waldmann
5791b89c04 use bytes type for ACL attributes, fixes #1205 
this saves some encoding / decoding dance compared to having a str interface.
 2016-06-26 23:04:04 +02:00
Thomas Waldmann
323894d195 Merge branch '1.0-maint' 2016-06-26 20:46:12 +02:00
Thomas Waldmann
36b1863c44 use long long for AES block counter, fixes #1206 2016-06-26 20:45:22 +02:00
Thomas Waldmann
ed128e517b Merge branch '1.0-maint' 2016-06-25 17:18:14 +02:00
TW
79c59bffa8 Merge pull request #1201 from ThomasWaldmann/doc-updates 
Doc updates
 2016-06-25 15:31:53 +02:00
Thomas Waldmann
b10025c6e5 document sshd settings, fixes #545 2016-06-24 23:30:27 +02:00
Thomas Waldmann
f54f159db8 more details about checkpoints, add split trick, fixes #1171 2016-06-24 22:32:38 +02:00
Thomas Waldmann
ad65c5ac16 support docs: add freenode web chat link, fixes #1175 2016-06-24 21:48:21 +02:00
TW
3ff6ac09a6 Merge pull request #1179 from Abogical/list-format 
Apply --format when listing repository archives, fixes #1166
 2016-06-24 18:29:03 +02:00
TW
c2eae540c3 Merge pull request #1199 from verygreen/bug1195 
Ignore empty index file.
 2016-06-24 17:53:54 +02:00
enkore
13b6f173ed Merge pull request #1193 from ThomasWaldmann/openssl-1.0-1.1-compat 
OpenSSL 1.0 and 1.1 compatibility
 2016-06-24 17:20:07 +02:00
Oleg Drokin
f99792d31d Ignore empty index file. 
Empty index file is most likely a result from an unclean
shutdown in the middle of write, e.g. on ext4 with delayed
allocation enabled (default).
Ignoring such a file would get it recreated by other parts of code,
where as not ignoring it leads to an exception about
not being able to read enough bytes from the index.

this commit fixes #1195

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
 2016-06-24 11:18:54 -04:00
enkore
5b34483310 Merge pull request #1194 from ThomasWaldmann/more-placeholders 
add placeholder support at missing places, add missing help
 2016-06-23 17:38:04 +02:00
Thomas Waldmann
12cb66b9f6 fix "patterns" help formatting, too 
this way it renders nicely in html (via sphinx) and on console
 2016-06-22 08:44:14 +02:00
Thomas Waldmann
5ae340998c update docs about placeholders 2016-06-22 08:40:31 +02:00
Thomas Waldmann
6407742d78 support placeholders for --prefix (everywhere), fixes #1027 
this fixes a ugly inconsistency: you could use placeholder for borg create's archivename.
but you could not use them for borg prune's prefix option.
 2016-06-21 23:36:30 +02:00
Thomas Waldmann
b072e99394 fix invalid placeholder in unit test 2016-06-21 23:14:44 +02:00
Thomas Waldmann
b630ae9231 catch and format exceptions in arg parsing 2016-06-21 23:00:08 +02:00
Thomas Waldmann
ad1729401f improve exception handling for placeholder replacement 
do not ignore bad placeholders and just return empty string,
this could have bad consequences, e.g. with --prefix '{invalidplaceholder}':
a typo in the placeholder name would cause the prefix to be the empty string.
 2016-06-21 22:58:56 +02:00
Thomas Waldmann
52007dbd43 add tests for format_line 2016-06-21 22:02:13 +02:00
Thomas Waldmann
0f7eb871fd slightly refactor placeholder related code 
- move from instance method to global function, so it can be used in other contexts also
- rename preformat_text -> replace_placeholders
 2016-06-21 21:52:20 +02:00
Thomas Waldmann
b5362fa5c8 make borg build/work on OpenSSL 1.0 and 1.1, fixes #1187 
in openssl 1.1, the cipher context is opaque, members can not
be accessed directly. we only used this for ctx.iv to determine
the current IV (counter value).

now, we just remember the original IV, count the AES blocks we
process and then compute iv = iv_orig + blocks.

that way, it works on OpenSSL 1.0.x and >= 1.1 in the same way.
 2016-06-21 20:20:48 +02:00
Thomas Waldmann
27c0d0f074 move attic test dependency into own file 
so you can just empty that file to remove the attic-based tests
when testing in a OpenSSL 1.1 environment.
 2016-06-21 20:06:36 +02:00
Abogical
6658112f8c Add documentation for listing repository archives 2016-06-21 20:01:01 +03:00
Thomas Waldmann
a19c9861bf crypto: use pointer to cipher context 
this is one of the steps needed to make borg compatible to openssl 1.1.
 2016-06-20 23:40:30 +02:00
Abogical
87173d25de Added testsuite for listing repository archives 2016-06-20 19:23:22 +03:00
Abogical
c839eb63f7 Apply --format when listing repository archives 2016-06-20 19:23:15 +03:00
Abogical
0942bcd1b4 Move code block for the write() function at do_list() 2016-06-20 16:14:52 +03:00
enkore
0b9689063d Merge pull request #1188 from jrtc27/ldpreload-eatmydata 
Correctly handle multiple LD_PRELOAD entries; fixes #1111
 2016-06-19 23:34:16 +02:00
James Clarke
d4f5172771 Correctly handle multiple LD_PRELOAD entries; fixes #1111 2016-06-19 22:04:03 +01:00
TW
91f92d65df Merge pull request #1173 from ThomasWaldmann/fix-sparse-test 
fix sparse file test, fixes #1170
 2016-06-19 22:48:33 +02:00
Thomas Waldmann
37835f7d6c Merge branch '1.0-maint' 2016-06-19 15:11:36 +02:00
TW
195a6b9093 Merge pull request #1186 from ThomasWaldmann/ignore-F405 
flake8: ignore F405, fixes #1185
 2016-06-19 15:09:26 +02:00
Thomas Waldmann
278cf0b9ad helpers: fix "undefined name 'e'" in exception handler 2016-06-19 14:55:57 +02:00