mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-28 02:38:43 +00:00
Code Issues Releases Wiki Activity
2402 commits 9 branches 139 tags 61 MiB
Commit graph

2402 commits

This branch
This branch
All branches
Author SHA1 Message Date
TW
8c26945097 Merge pull request #1158 from ThomasWaldmann/pretty-key 
add Key/EncryptedKey PropDict, see #1157
 2016-06-12 14:51:46 +02:00
TW
fa77e74908 Merge pull request #1154 from hemio-ev/uuid-format-tags 
Adds uuid to archive format tags
 2016-06-12 14:48:17 +02:00
Thomas Waldmann
d2468d37df add Key/EncryptedKey PropDict 2016-06-12 04:28:40 +02:00
Michael Herold
d45a13babf Changes archive format from uuid to uuid4 
This allows for future support of other uuid versions
 2016-06-11 22:57:03 +02:00
Michael Herold
5aa97e283c Adds uuid to archive format tags 2016-06-11 12:03:55 +02:00
TW
34d07d1526 Merge pull request #1150 from enkore/fix/solaris 
Fix test_sparse_file for solaris
 2016-06-10 21:09:44 +02:00
jenkins
b86775ab4f
Fix test_sparse_file for solaris 2016-06-10 12:21:03 +02:00
Thomas Waldmann
d813775065 Merge branch '1.0-maint' 2016-06-09 20:29:44 +02:00
Thomas Waldmann
9ef565b00e Merge branch '1.0-maint' 2016-06-09 20:21:48 +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
808379921c Merge pull request #1134 from enkore/fix/SyncFileX 
SyncFile: open with O_EXCL (or equivalent)
 2016-06-04 23:33:59 +02:00
Marian Beermann
e41f3ecc5b
SyncFile: open with O_EXCL (or equivalent) 2016-06-04 22:47:27 +02:00
TW
62a2a7302e Merge pull request #1132 from ThomasWaldmann/fuse-changes 
fuse: simplify timestamp processing
 2016-06-04 18:21:53 +02:00
TW
504af0206d Merge pull request #1117 from ThomasWaldmann/items-refactor 
refactor to use Item class
 2016-06-04 17:51:08 +02:00
Thomas Waldmann
75244ea6d1 fuse: simplify timestamp processing 2016-06-04 17:34:03 +02:00
Thomas Waldmann
60da32123a refactor to use Item class, fixes #1071 2016-06-04 17:24:55 +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
TW
60fad6388e Merge pull request #1120 from anarcat/patch-4 
update install docs table again
 2016-06-04 17:14:33 +02:00
anarcat
5167dca58c update install docs table again 
* sort install list (fedora was out of place)
* add EPEL
* borg is not young anymore, warn about old distros
* more coherent *BSD ports naming
* add raspbian, openindiana and mageia
 2016-06-04 10:42:07 -04: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
TW
9452cd8263 Merge pull request #1123 from ThomasWaldmann/fix-vagrant 
vagrant: fix path to borg package, add hidden import
 2016-06-03 20:39:40 +02:00
Thomas Waldmann
87b85a3f7a vagrant: fix path to borg package, add hidden import 2016-06-03 18:00:01 +02:00
enkore
bf5406d05a Merge pull request #1113 from enkore/feature/pltstr 
platform_base should use platform-provided implementations when needed
 2016-05-31 17:28:19 +02:00
Marian Beermann
0ca1a18b33
Make borg.platform a package 2016-05-31 15:38:56 +02:00
Marian Beermann
0333f91eb2 platform: rearrange imports 2016-05-31 15:38:16 +02:00
Marian Beermann
2d90bb2c55 Compose platform_base from the platform-specific functionality 
Noticed while working on the windows branch.
 2016-05-31 15:38:16 +02:00
enkore
a1c4d45920 Merge pull request #1112 from ThomasWaldmann/refactor-helper-imports 
split helpers import into multiple ones
 2016-05-31 15:07:14 +02:00
Thomas Waldmann
d3deec9fc9 cleanup / reorder imports 
import stdlib
from stdlib import x

import 3rd party

import borg stuff
 2016-05-31 01:18:03 +02:00
Thomas Waldmann
49484d6d67 split helpers import into multiple ones 2016-05-31 00:33:13 +02:00
Thomas Waldmann
d62f55158e sphinx: fix sys.path so it finds the borg package 2016-05-30 23:00:33 +02:00
TW
0aec338761 Merge pull request #1016 from ThomasWaldmann/move-to-src 
move to src/
 2016-05-30 22:50:12 +02:00
Thomas Waldmann
c15787852a tox.ini: remove changedir 2016-05-30 22:10:03 +02:00
Thomas Waldmann
7e0ea1635a Merge branch 'master' into move-to-src 2016-05-30 19:41:30 +02:00
Thomas Waldmann
045e5a1203 Merge branch 'master' into move-to-src 2016-05-30 19:38:16 +02:00
TW
6b666b217b Merge pull request #1108 from ThomasWaldmann/nitpicks 
log format tests: be more clear about new and old
 2016-05-30 19:21:05 +02:00
Thomas Waldmann
76d429edd3 log format tests: be more clear about new and old 2016-05-30 18:57:57 +02:00
TW
479819efa0 Merge pull request #1096 from edgewood/simplify_remote_logging_test 
Break out remote log and stderr handling code to simplify testing
 2016-05-30 18:47:33 +02:00
TW
e69bc362e5 Merge pull request #858 from enkore/issue/843 
Auto-recover from corrupted index/hints file(s)
 2016-05-30 17:15:23 +02:00
enkore
1ec149fe27 Merge pull request #1095 from Voltara/master 
RemoteRepository: Fix busy wait in call_many, fixes #940
 2016-05-29 22:41:22 +02:00
Marian Beermann
d1ce746a02
borg.hashindex: use PyErr_SetFromErrnoWithFilename 
instead of home-grown (i.e. not medical grade) OSError raising.
 2016-05-29 19:52:56 +02:00
Marian Beermann
9ebb37cab8
testsuite/repository: fixup for 7a569bc 2016-05-29 18:51:13 +02:00
enkore
3be3de7032 Merge pull request #1097 from RonnyPfannschmidt/header-fix 
obtain ioctl from sys/ioctl.h as per manpage
 2016-05-29 00:50:03 +02:00
Ronny Pfannschmidt
7b564e518d obtain ioctl from sys/ioctl.h as per manpage 
fixed build failure on fedora
 2016-05-28 23:51:13 +02:00
Ed Blackman
d42f1e691a Break out remote log and stderr handling code to simplify testing 
May fix issue 1081, but that issue is hard to reproduce.
 2016-05-27 23:09:46 -04:00
Marian Beermann
1f33861fd6 Repository: better error reporting for index/hints failures 2016-05-27 22:25:15 +02:00
Marian Beermann
d979a84f37 Handle permission and similar errors on the index 2016-05-27 22:24:01 +02:00
Marian Beermann
252c1b9802 Auto-recover from corrupted index/hints file(s) 
And don't swallow all OSErrors when creating archives. We need to work on
that on a more general level...
 2016-05-27 22:24:01 +02:00