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
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
3e22a0f653
Merge pull request #4041 from ThomasWaldmann/rel117
...
release 1.1.7
2018-08-11 21:45:28 +02:00
4e236daf0c
update CHANGES (py356 not available yet)
2018-08-11 19:23:17 +02:00
d04fc3b0ef
Revert "vagrant: use python 3.5.6 (1.1-maint)"
...
This reverts commit 6fe6abc0da
2018-08-11 19:22:31 +02:00
ad5615fa81
update CHANGES (release date 1.1.7)
2018-08-11 18:15:21 +02:00
a855c9769d
Merge pull request #4026 from ThomasWaldmann/update-changes-1.1
...
update CHANGES
2018-08-11 18:11:29 +02:00
7b98dd3b58
update CHANGES (1.1)
2018-08-11 18:10:36 +02:00
2ada9baf4a
Merge pull request #4040 from ThomasWaldmann/update-man-usage
...
Update man / usage
2018-08-11 18:07:30 +02:00
163356db56
build_usage
2018-08-11 18:05:09 +02:00
e88c2346ea
build_man
2018-08-11 18:03:32 +02:00
7df39ebb9f
Merge pull request #4039 from ThomasWaldmann/own-oi-box
...
use own openindiana box
2018-08-11 17:52:17 +02:00
d533f4d691
use own openindiana box
...
the one on vagrantcloud is not very recent...
2018-08-11 17:50:34 +02:00
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
6fe6abc0da
vagrant: use python 3.5.6 (1.1-maint)
2018-08-11 16:49:54 +02:00
feaeb7ba98
Merge pull request #4035 from ThomasWaldmann/osxfuse382
...
vagrant: use osxfuse 3.8.2
2018-08-11 14:33:24 +02:00
799d7b5904
vagrant: use osxfuse 3.8.2
2018-08-11 14:27:31 +02:00
a0cd7627bc
Merge pull request #4034 from newtonne/fix-man-table-1.1
...
Remove row/column-spanning from docs source, fixes #4000
2018-08-11 14:04:53 +02:00
f2f9838201
Remove row/column-spanning from docs source, fixes #4000
...
Sphinx doesn't support row or column-spanning, which caused the content
of the additional features table to be incorrect. To fix this, we now
define the content of each cell explicitly.
This change also fixes #3990 .
(cherry picked from commit 11a2f1f684
2018-08-11 10:58:30 +01:00
855ae3f7ee
Merge pull request #4025 from ThomasWaldmann/fix-cachedir-1.1
...
don't archive tagged dir when recursing an excluded dir, fixes #3991
2018-08-09 15:33:37 +02:00
a38bdd7090
Merge pull request #4023 from ThomasWaldmann/hostname-fqdn-cleanups-1.1
...
call socket.gethostname only once
2018-08-09 13:28:00 +02:00
059ad8d8ae
Merge pull request #4021 from ThomasWaldmann/init-warning-1.1
...
init: add warning to store both key and passphrase at safe place(s)
2018-08-09 09:29:11 +02:00
0fa63d9bac
don't archive tagged dir when recursing an excluded dir, fixes #3991
...
if we are recursing an explicitly excluded directory, we are only
looking for explicitly included items, but we do not need to archive
tagged directories or the tag files themselves - they are all excluded
by the explicit exclusion already.
for performance reasons, we still determine whether a directory is
tagged and if it is, we do not recurse into it as there can't be any
included items in there.
(cherry picked from commit 8256c26cf2
2018-08-09 09:25:32 +02:00
382e37feb7
call socket.gethostname only once
...
(cherry picked from commit d2e2f1b89d
2018-08-09 09:08:43 +02:00
48ed187279
Merge pull request #4020 from ThomasWaldmann/machine-id-1.1
...
add BORG_HOST_ID, fixes #3985
2018-08-09 09:01:15 +02:00
105a23ac0e
Merge pull request #4019 from ThomasWaldmann/py37-1.1
...
Py37 (1.1 backport)
2018-08-09 08:38:00 +02:00
d21da08f85
init: add warning to store both key and passphrase at safe place(s)
...
(cherry picked from commit 4b31ad123f
2018-08-09 08:22:00 +02:00
901e3a7888
add BORG_HOST_ID, fixes #3985
...
(cherry picked from commit 90348c1de9
2018-08-09 08:11:05 +02:00
2cbfd54490
travis: reorder envs, remove 3.6-dev
...
flake8 first, 34/35/36/37 linux, 34/35/36 osx
also remove quotes around version number, not needed for 3.7.
2018-08-09 08:04:38 +02:00
ad6bb9cd1e
add python 3.7 to pypi metadata
...
(cherry picked from commit 751cd2caed
2018-08-09 07:59:03 +02:00
836dc0b568
tox / travis: enable testing on py37
...
(cherry picked from commit fef9581690
2018-08-09 07:57:56 +02:00
02dbe5fd5c
argparse: work around bad default in py 3.7.0a/b/rc, fixes #3996
...
(cherry picked from commit 52f1cd4bc6
2018-08-09 07:52:37 +02:00
64f2fc0a65
Merge pull request #3824 from ThomasWaldmann/finding-pieces
...
some more debug commands
2018-08-09 07:27:54 +02:00
24812b0317
dump-repo-objs: filename layout improvements
2018-08-09 06:49:48 +02:00
8738e85967
implement borg debug dump-repo-objs --ghost
...
intended as a last resort measure to export all segment file contents
in a relatively easy to use format.
if you want to dig into a damaged repo (e.g. missing segment files,
missing commits) and you know what you do.
note: dump-repo-objs --ghost must not use repo.list()
because this would need the repo index and call get_transaction_id and
check_transaction methods, which can easily fail on a damaged repo.
thus we use the same low level scan method as we use anyway to get
some encrypted piece of data to setup the decryption "key".
2018-08-09 06:49:48 +02:00
2b7d65b024
use repository.scan() for dump-repo-objs to get on-disk order
...
it is also more efficient, avoids random access.
2018-08-09 06:49:48 +02:00
c2ed0d9ee0
implement borg debug search-repo-objs searchterm
2018-08-09 06:49:48 +02:00
b951a2ee42
Merge pull request #3997 from ThomasWaldmann/py37-1.1
...
remove loggerDict.clear() from tearDown method, fixes #3805
2018-07-29 13:54:40 +01:00
a9d523d6d8
remove loggerDict.clear() from tearDown method, fixes #3805
...
It causes problems with the new caching in the py37 logger module.
Removing loggerDict.clear() fixes this and makes the tests work again.
Also, it does not seem to have any negative effect, neither on py36
nor on py37.
See also: https://bugs.python.org/issue34269
2018-07-29 12:43:06 +01:00
39c7bd90f1
Merge pull request #3989 from margau/1.1-maint
...
Backport of #3987 into 1.1-maint
2018-07-20 16:59:06 +02:00
1c250ae39c
Backport of #3987
...
Backport of https://github.com/borgbackup/borg/pull/3987
2018-07-20 16:25:17 +02:00
5e3f62f95b
Merge pull request #3982 from ThomasWaldmann/locking-fixes-1.1
...
Locking: better logging, some asserts (1.1)
2018-07-17 19:04:16 +02:00
f86bf8a0a8
locking: more logging
2018-07-17 00:18:57 +02:00
2bf1b29e8e
process_alive: add some assertions
2018-07-17 00:18:57 +02:00
ab0da76c5d
Merge pull request #3981 from ThomasWaldmann/fix-cache-lock-timeout-1.1
...
cache lock: use lock_wait everywhere to fix infinite wait
2018-07-16 23:48:26 +02:00
2f3e60d9d5
cache lock: use lock_wait everywhere to fix infinite wait
...
also: clarify docs
2018-07-15 10:51:40 +02:00
98b8d77788
Merge pull request #3979 from ThomasWaldmann/fix-nanorst-1.1
...
nanorst: add missing blank to exception message (1.1 bp)
2018-07-13 11:38:35 +02:00
223e739c0a
nanorst: add missing blank to exception message
...
(cherry picked from commit 0d06407087
2018-07-13 10:44:17 +02:00
9db024c884
Merge pull request #3973 from ThomasWaldmann/fix-ext-version-check-1.1
...
fix logic bug in platform module API version check (1.1 bp)
2018-07-08 15:12:00 +02:00
5c71c4f990
fix logic bug in platform module API version check
...
(cherry picked from commit 2bb23f00af
2018-07-08 14:53:00 +02:00
TW