1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-25 07:23:28 +00:00
Commit graph

5112 commits

Author SHA1 Message Date
TW
3837441e08
Merge pull request #4196 from ThomasWaldmann/fat-binary-docs
docs: tell that our binaries are amd/intel, bauerj has ARM
2018-12-07 00:40:41 +01:00
Thomas Waldmann
13986a1a6a docs: tell that our binaries are amd/intel, bauerj has ARM 2018-12-06 21:41:30 +01:00
TW
ec0e56a2b9
Merge pull request #4189 from ralphtheninja/typo
Fix tiny typo in README
2018-11-28 23:53:22 +01:00
Lars-Magnus Skog
0e39a8c88d Fix tiny typo in README 2018-11-28 12:19:41 +01:00
TW
f68ff618dd
Merge pull request #4187 from ThomasWaldmann/location-parse-error-msg-1.1
invalid locations: give err msg containing parsed location, fixes #4179
2018-11-28 12:08:58 +01:00
Thomas Waldmann
14464161ed invalid locations: give err msg containing parsed location, fixes #4179
(cherry picked from commit 65d8091245)
2018-11-28 01:56:58 +01:00
TW
0db87c116a
Merge pull request #4185 from ThomasWaldmann/more-placeholders-1.1
list repo: add placeholders for hostname and username, fixes #4130
2018-11-28 01:17:25 +01:00
Thomas Waldmann
8859af731d list repo: add placeholders for hostname and username, fixes #4130
also: use a more generic get_meta() access method to avoid duplication.
(cherry picked from commit e9ac9beef0)
2018-11-28 00:26:26 +01:00
TW
09fc630877
Merge pull request #4177 from ThomasWaldmann/eisdir-fix-1.1
fix EISDIR issues (1.1-maint)
2018-11-17 02:32:26 +01:00
Thomas Waldmann
60347a4dd6 xattr key names must start with user. on linux
... or the call will just error with "operation not supported"

(cherry picked from commit 53971e8e79)
2018-11-17 01:30:57 +01:00
Thomas Waldmann
95aa1e77fd stop using fakeroot on travis, avoids #2482
on osx, we already ran the tests w/o fakeroot, directly as root.
do the same for linux.

(cherry picked from commit 562cce1dee)
2018-11-17 00:04:51 +01:00
TW
a26f90f9fc
Merge pull request #4176 from ThomasWaldmann/pytest4-1.1
support pytest4 (1.1-maint backport)
2018-11-16 22:55:24 +01:00
Thomas Waldmann
216d1f810f pytest4 complains if we directly call the fixture function, fixes #4172
just added a normal function with the code, call it from fixture and
also from unittest test method.

(cherry picked from commit d0a01c532e)
2018-11-16 21:56:38 +01:00
Thomas Waldmann
7985891992 pytest: use latest version
(cherry picked from commit 55717c4751)
2018-11-16 21:56:20 +01:00
TW
911ef0e031
Merge pull request #4166 from Ashmodei/1.1-maint-crud_docfix
Fixed help string in CRUD documentation. Backport to 1.1-maint
2018-11-12 18:44:20 +01:00
ashmodei
29edb0cf37 Fixed wrong an archive's name pattern in CRUD benchmark help. 2018-11-09 15:02:38 +03:00
TW
ccbcb4f1e3
Merge pull request #4161 from Ashmodei/1.1-maint-3561-backport
Added PATH::archive output for creation function on info log level. Backport to 1.1-maint
2018-11-09 11:49:51 +01:00
ashmodei
81f10266e3 Added PATH::archive output for creation function on info log level. 2018-11-09 10:39:03 +03:00
TW
fd1fe93c9a
Merge pull request #4151 from ThomasWaldmann/flake8-1.1
Flake8 fixes (backport to 1.1-maint)
2018-11-05 21:22:07 +01:00
Thomas Waldmann
4f1f98eee3 fixup: the help text is parsed as rst markup, so a lone * is an error
* and ** are interpreted as emphasis and need to be matched for begin
and end of emphasis. the \ in front of it is to get a non-markup *.

(cherry picked from commit 64a53ba43a)
2018-11-04 20:01:18 +01:00
Thomas Waldmann
50df335f37 flake8: use separate lines for different classes of flake8 ignores
(cherry picked from commit b0afc6709b)
2018-11-04 20:01:06 +01:00
Thomas Waldmann
76185efb84 flake8: fix W605 (invalid escape sequences)
(cherry picked from commit 5c66a60f79)
2018-11-04 19:58:46 +01:00
Thomas Waldmann
78c6d21a08 flake8: fix F841
(cherry picked from commit 10cdadb2f8)
2018-11-04 19:58:17 +01:00
Thomas Waldmann
b628166c5a flake8: disable the new checks of flake8 3.6 for now
(cherry picked from commit fc4a7bc0c9)
2018-11-04 19:50:00 +01:00
TW
b2f887e4b3
Merge pull request #4144 from step21/1.1-maint
misc backports to 1.1-maint
2018-11-02 23:57:51 +01:00
step21
27eeef242a Moving the flags of the compiled regex to the front to fix #4137 2018-11-02 00:37:35 +01:00
step21
2a3b534a61 Fixed link to cachedir spec in fs helper to address #4140 for 1.1-maint 2018-11-02 00:33:19 +01:00
step21
85fa5e67f3 Fixed link to cachedir spec in docs to address #4140 2018-11-02 00:28:48 +01:00
step21
34ee2af6b3 Explicitly convert environment variable to str to address #4136 2018-11-02 00:08:25 +01:00
TW
1900e0f677
Merge pull request #4095 from m3nu/1.1-maint
Add storage_quota for forced_result if set by serve-command.
2018-10-03 18:42:27 +02:00
Manu
975cc33206 Add storage_quota for forced_result if set by serve command. 2018-10-03 23:47:36 +08:00
TW
3162abb356
Merge pull request #4083 from steelman/borg-passphrase-fd-1.1
read a passphrase from a file descriptor
2018-09-22 19:09:52 +02:00
Łukasz Stelmach
82e37fbd03 read a passphrase from a file descriptor
Read a passpharase from a file descriptor specified in the
BORG_PASSPHRASE_FD environment variable.
2018-09-22 11:33:23 +02:00
TW
ac7bfec4a3
Merge pull request #4067 from audeoudh/1.1-maint
Forward the `format_spec` to `datetime` class (1.1 backport)
2018-08-30 12:33:23 +02:00
Henry-Joseph Audéoud
219e9d082a Forward the format_spec to datetime class
If specified, the argument `format_spec` is forwarded from the method
`OutputTimestamp.__format__` to the method `format_time` method.  Thus,
we are able to specify the format, in a way supported by the class
`datetime`.

The default behaviour of `format_time` is not affected.  The other parts
of code that does not provide a `format_spec` are not affected by the
change.
2018-08-30 10:49:50 +02:00
TW
3e22a0f653
Merge pull request #4041 from ThomasWaldmann/rel117
release 1.1.7
2018-08-11 21:45:28 +02:00
Thomas Waldmann
4e236daf0c update CHANGES (py356 not available yet) 2018-08-11 19:23:17 +02:00
Thomas Waldmann
d04fc3b0ef Revert "vagrant: use python 3.5.6 (1.1-maint)"
This reverts commit 6fe6abc0da.
2018-08-11 19:22:31 +02:00
Thomas Waldmann
ad5615fa81 update CHANGES (release date 1.1.7) 2018-08-11 18:15:21 +02:00
TW
a855c9769d
Merge pull request #4026 from ThomasWaldmann/update-changes-1.1
update CHANGES
2018-08-11 18:11:29 +02:00
Thomas Waldmann
7b98dd3b58 update CHANGES (1.1) 2018-08-11 18:10:36 +02:00
TW
2ada9baf4a
Merge pull request #4040 from ThomasWaldmann/update-man-usage
Update man / usage
2018-08-11 18:07:30 +02:00
Thomas Waldmann
163356db56 build_usage 2018-08-11 18:05:09 +02:00
Thomas Waldmann
e88c2346ea build_man 2018-08-11 18:03:32 +02:00
TW
7df39ebb9f
Merge pull request #4039 from ThomasWaldmann/own-oi-box
use own openindiana box
2018-08-11 17:52:17 +02:00
Thomas Waldmann
d533f4d691 use own openindiana box
the one on vagrantcloud is not very recent...
2018-08-11 17:50:34 +02:00
TW
84b063cb21
Merge pull request #4037 from ThomasWaldmann/vagrant-py356
vagrant: use python 3.5.6 (1.1-maint)
2018-08-11 16:51:35 +02:00
Thomas Waldmann
6fe6abc0da vagrant: use python 3.5.6 (1.1-maint) 2018-08-11 16:49:54 +02:00
TW
feaeb7ba98
Merge pull request #4035 from ThomasWaldmann/osxfuse382
vagrant: use osxfuse 3.8.2
2018-08-11 14:33:24 +02:00
Thomas Waldmann
799d7b5904 vagrant: use osxfuse 3.8.2 2018-08-11 14:27:31 +02:00