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

2116 Commits

Author SHA1 Message Date
TW d9b77d57c8 Merge pull request #1148 from ThomasWaldmann/fix-1135 
fix resync and msgpacked item qualifier, fixes #1135
 2016-06-09 22:08:55 +02:00
Thomas Waldmann 918e0b2a52 fix resync and msgpacked item qualifier, fixes #1135 
when trying to resync and skip invalid data, borg tries to qualify a byte sequence as
valid-looking msgpacked item metadata dict (or not) before even invoking msgpack's unpack.

besides previously hard to understand code, there were 2 issues:

- a missing check for map16 - this type is what msgpack uses if the dict has more than
15 items (could happen in future, not for 1.0.x).

- missing checks for str8/16/32 - str16 is what msgpack uses if the bytestring has more than 31 bytes
(borg does not have that long key names, thus this wasn't causing any harm)

this misqualification (valid data considered invalid) could lead to a wrong resync, skipping valid items.

added more comments and tests.
 2016-06-09 22:08:06 +02:00
TW b5b4a72fa6 Merge pull request #1137 from ThomasWaldmann/no-manifest 
better error handling for missing repo manifest, fixes #1043
 2016-06-09 21:41:02 +02:00
Thomas Waldmann e10d543ef4 delete a repo without manifest 2016-06-09 20:43:13 +02:00
Thomas Waldmann 6a70d9968c make borg check work for empty repo 2016-06-09 20:43:13 +02:00
Thomas Waldmann 7501c3b530 better error handling for missing repo manifest, fixes #1043 
can happen for not correctly initialized repos or corrupted repos.

here: borg list failing more pretty
 2016-06-09 20:43:13 +02:00
TW a8c4c9ffab Merge pull request #1144 from ThomasWaldmann/fix-prune-docs 
fix / clarify prune help, fixes #1143
 2016-06-06 16:12:46 +02:00
Thomas Waldmann fb89152392 fix / clarify prune help, fixes #1143 2016-06-06 16:11:22 +02:00
TW ee5e89b575 Merge pull request #1136 from ThomasWaldmann/env-security-cleanup 
remove passphrase from subprocess environment, fixes #1105
 2016-06-05 13:29:52 +02:00
Thomas Waldmann ca35d9f255 remove passphrase from subprocess environment, fixes #1105 2016-06-05 00:25:30 +02:00
TW 53937a2b60 Merge pull request #1131 from ThomasWaldmann/freebsd-llfuse-requirements 
llfuse: update version requirement for freebsd
 2016-06-04 17:18:20 +02:00
Thomas Waldmann 8e7ed8ebea llfuse: update version requirement for freebsd 
as the requirement string is a AND operation, I used the rough "<2.0" requirement
and then excluded the non-working versions.
 2016-06-04 15:53:30 +02:00
Thomas Waldmann 21a30269c2 freebsd: use a older llfuse release that builds 
llfuse >0.41.1 <=1.0.0 does not build on freebsd.
the issue is already fixed, but no new release yet.
 2016-05-20 21:50:26 +02:00
Thomas Waldmann 5be71b506e update CHANGES 2016-05-20 21:49:01 +02:00
Thomas Waldmann 8d8374d23c ran build_api + build_usage 2016-05-20 14:34:48 +02:00
TW 938628f4e1 Merge pull request #1062 from ThomasWaldmann/update-1.0-docs 
update CHANGES
 2016-05-20 14:06:27 +02:00
Thomas Waldmann 1e061a2fa4 update CHANGES 2016-05-20 14:05:05 +02:00
TW f974770db5 Merge pull request #1066 from enkore/issue/1063 
RepositoryCache: don't cache large objects
 2016-05-20 13:55:12 +02:00
Marian Beermann f7f95ae731
RepositoryCache: don't cache large objects 
avoids excessive cache repository disk usage
 2016-05-20 02:01:17 +02:00
enkore d043794757 Merge pull request #1052 from enkore/fix/commitcheck 
Repository: fix commit tags being seen in data
 2016-05-19 17:12:52 +02:00
Marian Beermann 714e93bf64
Repository: fix commit tags being seen in data 2016-05-19 01:12:06 +02:00
Thomas Waldmann 596a276a26 setup.py: add check for platform_darwin.c 
this was just forgotten...
 2016-05-18 18:07:10 +02:00
TW 5c6cfc6329 Merge pull request #1058 from enkore/issue/1056 
When probing key files, do binary reads
 2016-05-18 17:56:26 +02:00
Marian Beermann 24cd303ca9
When probing key files, do binary reads 2016-05-18 17:37:48 +02:00
TW eaf0f62022 Merge pull request #1049 from enkore/feature/sigterm 
Handle SIGTERM
 2016-05-17 19:28:14 +02:00
Marian Beermann 6cf61024d9
Handle SIGTERM and make a clean exit 2016-05-17 18:57:55 +02:00
TW f9638645d1 Merge pull request #996 from ThomasWaldmann/update-1.0-docs 
update CHANGES in 1.0-maint
 2016-05-05 13:51:59 +02:00
TW 6ae1999ff3 Merge pull request #1010 from ThomasWaldmann/doc-tags 
borg create help: document format tags, fixes #894
 2016-05-05 13:49:21 +02:00
Thomas Waldmann 7457c0f5da update CHANGES in 1.0-maint 2016-05-05 13:43:40 +02:00
Thomas Waldmann 9e09786b33 borg create help: document format tags, fixes #894 
docs: rephrased, more useful examples
 2016-05-05 13:38:08 +02:00
TW 21f753816d Merge pull request #1000 from ThomasWaldmann/prune-ignore-checkpoints 
borg prune: ignore checkpoints, fixes #997
 2016-05-02 01:26:06 +02:00
Thomas Waldmann b743fd09ab borg prune: ignore checkpoints, fixes #997 
also:
- add a test for this
- add some words to borg create help about the archive name
 2016-05-02 01:12:15 +02:00
Thomas Waldmann 700e715b23 add missing docs for borg break-lock, fixes #992 2016-04-30 00:32:25 +02:00
TW 7718d73133 Merge pull request #995 from ThomasWaldmann/update-site-urls 
update readthedocs urls, fixes #991
 2016-04-30 00:15:01 +02:00
Thomas Waldmann 4b73ebc613 update readthedocs urls, fixes #991 2016-04-29 03:19:27 +02:00
TW 81a1952c9a Merge pull request #978 from ThomasWaldmann/fix-osx 
vagrant: OS X update osxfuse / fix lzma, fixes #933
 2016-04-24 02:35:34 +02:00
Thomas Waldmann 5a7c027296 vagrant: OS X update osxfuse / fix lzma, fixes #933 2016-04-24 02:25:04 +02:00
TW 3060332f06 Merge pull request #944 from ThomasWaldmann/fix-942 
prune: fix bad validator, fixes #942
 2016-04-19 00:50:45 +02:00
Thomas Waldmann d52b5cf529 prune: fix bad validator, fixes #942 2016-04-19 00:49:35 +02:00
enkore 775b9c3b74 Merge pull request #920 from enkore/fix/caps 
Fix capabilities extraction on Linux
 2016-04-17 20:25:16 +02:00
Marian Beermann 39a40cd7b7
Fix capabilities extraction on Linux 
They are extracted correctly, for a little while at least, since chown()
*resets* all capabilities on the chowned file. Which I find curious,
since chown() is a privileged syscall. Probably a safeguard for
sysadmins who are unaware of capabilities.

The solution is to set the xattrs last, after chown()ing files.
 2016-04-16 23:52:27 +02:00
Thomas Waldmann 8662202486 update CHANGES 2016-04-16 02:39:22 +02:00
Thomas Waldmann 813dbc4d25 Merge branch '1.0-maint' of github.com:borgbackup/borg into 1.0-maint 2016-04-16 02:36:06 +02:00
TW f162477c7e Merge pull request #914 from verygreen/fix-fadvise 
Workround a bug in Linux fadvise FADV_DONTNEED, fixes #907
 2016-04-16 02:29:35 +02:00
Oleg Drokin ce176b52bf Workround a bug in Linux fadvise FADV_DONTNEED, fixes #907 
Despite what the man page says, Linux does not discard the initial
partial page only. The ending page would be truncated no matter if
it is partial or not.
Page-align the fadvise size to take care of this.
Also while we are at it, roll back initial fadvise offset to the
previous page boundary to actually throw away that page as we
no longer need it having read the second part now and the first
time in the previous call.

This patch has a noticeable impact in my Linux testing when the file
is on the rotating media. The total test runtime decreased by a bit
over 10%, but since over half of that time was actually cpu time,
the actual iowait time decreased around 20%.
 2016-04-15 20:16:47 -04:00
Thomas Waldmann 956e9957b2 update CHANGES 2016-04-16 00:59:59 +02:00
Thomas Waldmann c4d1d01d11 use latest llfuse for vagrant machines 2016-04-16 00:57:20 +02:00
TW 104e88534e Merge pull request #910 from ThomasWaldmann/docs-clarify-mountpoint 
docs fixes
 2016-04-15 12:08:08 +02:00
Thomas Waldmann 43b4fda393 docs: fix confusing usage of "repo" as archive name 2016-04-15 03:38:43 +02:00
Thomas Waldmann bc854e3e64 docs: use /path/to/repo, fixes #901 
/mnt/backup was confusing as people like to mount their backup disk on /mnt/backup,
but borg init /mnt/backup does not work if that directory already exists because it is
the mountpoint. it would work, if /mnt was the mountpoint, but that is not obvious
and also unusual.
 2016-04-15 03:35:37 +02:00