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

2695 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Waldmann
1c55930840 ran build_usage 2016-12-17 20:06:41 +01:00
Marian Beermann
f2f50efc28 check: handle duplicate archive items neatly 
Signed-off-by: Thomas Waldmann <tw@waldmann-edv.de>
 2016-12-17 20:06:41 +01:00
Marian Beermann
28ad779a6f Add tertiary authentication for metadata (TAM) 
Signed-off-by: Thomas Waldmann <tw@waldmann-edv.de>
 2016-12-17 20:06:41 +01:00
enkore
343387b36e Merge pull request #1966 from enkore/1.0-340 
Fix subsubparsers for Python <3.4.3
 2016-12-17 18:00:15 +01:00
Marian Beermann
e28b470cfb Fix subsubparsers for Python <3.4.3 
This works around http://bugs.python.org/issue9351

Since Debian and Ubuntu ship 3.4.2 and 3.4.0 respectively.
 2016-12-17 18:00:03 +01:00
enkore
0b32524cda Merge pull request #1965 from borgbackup/pytest2 
conftest: pytest 2 compat
 2016-12-17 15:58:07 +01:00
enkore
af923e261b conftest: pytest 2 compat 2016-12-17 15:23:47 +01:00
enkore
49c05719d8 Merge pull request #1941 from enkore/issue/1936 
Fix some clock problems
 2016-12-17 13:20:56 +01:00
Marian Beermann
baa8baafdb create: fix duration if --timestamp is given 2016-12-17 12:55:16 +01:00
Marian Beermann
445365b3ff update changes 2016-12-17 12:00:25 +01:00
Marian Beermann
f5d6093ccc fix checkpoints when clock jumps 2016-12-17 11:58:26 +01:00
Marian Beermann
a8d921a54c base archive timestamps on end time 
The assumption is that if the clock jumps during the Borg run that it
was jump-corrected and is now correct, while the start timestamp would
be wrong.
 2016-12-17 11:58:26 +01:00
Marian Beermann
2dc558a02e fix create progress not updating if clock jumps 2016-12-17 11:58:25 +01:00
Marian Beermann
420c984f05 fix wrong duration if clock jumps during create 2016-12-17 11:58:25 +01:00
enkore
9396aacb21 Merge pull request #1962 from ThomasWaldmann/win10-linux-subsys 
document windows 10 linux subsystem install
 2016-12-17 11:34:25 +01:00
enkore
20d3eff8c4 Merge pull request #1963 from ThomasWaldmann/fix-win10-lxsys-tests 
catch errno.ENOSYS for mknod (win 10 lxsys)
 2016-12-17 11:33:52 +01:00
Thomas Waldmann
61370082d6 catch errno.ENOSYS for mknod (win 10 lxsys) 
mknod raises this when running as non-root under Windows 10's Linux Subsystem.
 2016-12-17 00:37:00 +01:00
Thomas Waldmann
6b6ddecd93 document windows 10 linux subsystem install 
also add note about remote repos being broken on cygwin.
 2016-12-17 00:25:49 +01:00
TW
4f0c2ab68c Merge pull request #1959 from ThomasWaldmann/pretty-test-fails2 
pytest: only rewrite the testsuite, fixes #1938
 2016-12-16 00:25:24 +01:00
Thomas Waldmann
04340ae8b1 pytest: only rewrite the testsuite, fixes #1938 
do not rewrite the borg application code, just the test code,
so the bytecode tested is identical / very close to the bytecode used in practice.
 2016-12-15 03:02:06 +01:00
TW
7f63ca8922 Merge pull request #1953 from ThomasWaldmann/fix-1932 
add a borg debug/key dummy command, fixes #1932
 2016-12-14 02:50:08 +01:00
Thomas Waldmann
5a40870416 add a borg debug/key dummy command, fixes #1932 
the problem was that there neither was a do_debug implementation for the case
someone just enters "borg debug", nor did the parser inherit from common_parser
(so accessing .umask triggered an exception before setup_logging() was called,
which triggered another exception when log output should have been emitted).

same for do_key ("borg key").

added a generic handler that just prints the subcommand help.
 2016-12-14 01:57:48 +01:00
TW
60bbd7a944 update CHANGES (1.0-maint) (#1954) 2016-12-14 01:29:43 +01:00
TW
d13854853c Merge pull request #1937 from ThomasWaldmann/location-parser 
fix the user part parsing in the Location parser
 2016-12-13 23:12:53 +01:00
Thomas Waldmann
292ff42655 refactor common regex part into optional_user_re 2016-12-13 22:47:12 +01:00
enkore
60b6f5a30e Merge pull request #1951 from ThomasWaldmann/pretty-test-fails 
get back pytest's pretty assertion failures, fixes #1938
 2016-12-13 20:58:58 +01:00
Thomas Waldmann
c6017abfb7 get back pytest's pretty assertion failures, fixes #1938 2016-12-13 19:27:01 +01:00
enkore
796ea9edde Merge pull request #1939 from ThomasWaldmann/update-1.0-changes 
update CHANGES (1.0-maint)
 2016-12-11 15:20:22 +01:00
Thomas Waldmann
bd8b4a4489 update CHANGES (1.0-maint) 2016-12-09 04:42:23 +01:00
Thomas Waldmann
335d599db4 fix location parser for archives with @ char, add test, fixes #1930 
we must exclude colon and slash chars from the username, otherwise the term for the user part
will match everything up to a @ char in the archive name.

a slash can't be in a username as the home directory would contain a illegal slash (slash is path sep),

a colon likely also should not be in a username because chown user:group ... syntax.
 2016-12-09 03:37:13 +01:00
enkore
4affad73d1 Merge pull request #1924 from ThomasWaldmann/pr-template 
add a PR template pointing to guidelines
 2016-12-03 20:40:33 +01:00
Thomas Waldmann
dfd37d09d5 add a PR template pointing to guidelines 2016-12-03 18:34:34 +01:00
TW
7eb2dff116 Merge pull request #1922 from enkore/f/buildusage 
setup.py: fix build_usage not processing all commands
 2016-12-02 17:33:07 +01:00
Marian Beermann
288cac788c setup.py: build_usage: don't generate includes for debug commands 2016-12-02 13:28:49 +01:00
Marian Beermann
1c261f6b7b setup.py: fix build_usage not processing all commands 2016-12-02 13:25:24 +01:00
TW
8ddbc45c29 Merge pull request #1906 from enkore/f/check-corrupted-manifest 
check: handle corrupted manifest
 2016-11-30 04:31:58 +01:00
TW
2a340bf21c Merge pull request #1907 from ThomasWaldmann/cygwin-docs 
docs: add python3-devel as a dependency for cygwin-based installation
 2016-11-30 02:51:16 +01:00
Thomas Waldmann
d6d3f275df docs: add python3-devel as a dependency for cygwin-based installation 2016-11-30 02:50:20 +01:00
Marian Beermann
146d586b3b check: skip corrupted chunks during manifest rebuild 2016-11-30 01:43:01 +01:00
Marian Beermann
71775bac97
check: rebuild manifest if it's corrupted 2016-11-30 01:06:23 +01:00
enkore
cdd9891444 Merge pull request #1905 from ThomasWaldmann/fix-1903 
fix TypeError in errorhandler, fixes #1903
 2016-11-30 01:03:17 +01:00
Thomas Waldmann
989b2286ff fix TypeError in errorhandler, fixes #1903 2016-11-30 00:37:30 +01:00
TW
b25de0ab38 Merge pull request #1895 from ThomasWaldmann/fix-1894 
fix traceback in Error handler if id is None, fixes #1894
 2016-11-29 19:26:17 +01:00
Thomas Waldmann
cd50e286f7 fix traceback in Error handler if id is None, fixes #1894 2016-11-29 18:27:20 +01:00
TW
baab519843 Merge pull request #1898 from ThomasWaldmann/fix-1897 
test_get_(cache|keys)_dir: clean env state, fixes #1897
 2016-11-29 18:21:01 +01:00
Thomas Waldmann
9e760a69a2 test_get_(cache|keys)_dir: clean env state, fixes #1897 
make sure the BORG_(CACHE|KEYS)_DIR env var is not set initially.
 2016-11-29 14:08:58 +01:00
enkore
619cb123e5 1.0 maint AUTHORS +me 2016-11-28 22:51:01 +01:00
TW
2780a83452 Merge pull request #1885 from jcrben/patch-1 
Clarify extract is relative to current directory
 2016-11-27 20:41:39 +01:00
Ben Creasy
a49fc6faf5 Clarify extract is relative to current directory 
I'm still hoping that a destination switch can be added (requested long ago in https://github.com/jborg/attic/issues/195), but in the meantime this may help. I'm guessing this clobbers any existing files.
 2016-11-27 11:35:36 -08:00
enkore
104e9f3169 Merge pull request #1889 from enkore/f/109docfixes 
1.0.9rc1 doc fixes
 2016-11-27 20:33:36 +01:00