TW
9797ab0130
Merge pull request #612 from ThomasWaldmann/fix-544
...
borg serve: overwrite client's --restrict-to-path with forced command's …
2016-01-30 20:04:09 +01:00
TW
5d93b6cda9
Merge pull request #613 from ThomasWaldmann/xdg-base-dir-keys
...
use xdg base dir for keys
2016-01-30 20:02:38 +01:00
Thomas Waldmann
8ec62d5e2e
use os.path.normpath on repository paths, fixes #606
...
this does NOT fix absolute vs. relative path usage,
but as this also deals with remote paths, this can't be done in general.
2016-01-30 00:39:25 +01:00
Thomas Waldmann
d6b43a7346
Merge branch 'master' of github.com:borgbackup/borg
2016-01-30 00:01:44 +01:00
Thomas Waldmann
7773e632db
fix some minor cosmetic code/docs issues
2016-01-30 00:01:13 +01:00
TW
68157d63fe
Merge pull request #614 from ThomasWaldmann/list-short-repo
...
implement --short for borg list REPO, fixes #611
2016-01-29 21:54:19 +01:00
Thomas Waldmann
12fe47fcd2
implement --short for borg list REPO, fixes #611
2016-01-29 01:50:51 +01:00
Thomas Waldmann
695dc68479
slightly rephrase prune help
2016-01-29 01:40:29 +01:00
Thomas Waldmann
e7add135a2
add upgrader which moves the keys to new location
2016-01-29 01:23:24 +01:00
Thomas Waldmann
e06b7162c2
update docs / docstring about new key location
2016-01-28 23:15:49 +01:00
Thomas Waldmann
b8d954e60a
use XDG_CONFIG_HOME for borg keys instead of ~/.borg, fixes #515
2016-01-28 22:26:58 +01:00
Thomas Waldmann
7ea2404048
borg serve: overwrite client's --restrict-to-path with forced command's option value, fixes #544
...
we also make sure the client is not cheating, like giving another subcommand or his own --restrict-to-path.
2016-01-28 21:59:24 +01:00
Thomas Waldmann
824e548b9f
add missing example for --list option of borg create
2016-01-28 20:32:30 +01:00
Thomas Waldmann
e7c2189a3f
implement --list for borg extract
...
before, borg extract always emitted the full file list at info log level.
now, you need to give --list to get the full file list (consistent with borg create --list).
this is currently only useful if you also use other output-generating options,
e.g. --show-rc - you can now leave away --list to only get that other output.
later, if extract gets more output-generating options, --list will get more useful.
2016-01-28 20:25:55 +01:00
TW
74ac982775
Merge pull request #605 from m3741/fix-604
...
Fix for Issue #604
2016-01-26 19:12:23 +01:00
Adam Kouse
dcffa5c6a2
Single quote exclude line that includes an asterisk to prevent shell expansion
2016-01-26 11:51:38 -05:00
TW
fd9f9792cb
Merge pull request #601 from trassl/master
...
Reformat commands list
2016-01-26 13:34:13 +01:00
Christoph Trassl
3061b3048c
Reformat commands list.
2016-01-25 18:45:32 +01:00
TW
9f70a4c0e0
Merge pull request #596 from Herover/patch-1
...
Fix dead link to license
2016-01-25 14:06:05 +01:00
Herover
29b84a1b43
Use https on updated license link
2016-01-25 13:33:48 +01:00
TW
8f18b4bcf1
Merge pull request #597 from LocutusOfBorg/patch-1
...
Delete Ubuntu Vivid, EOL
2016-01-25 10:51:56 +01:00
Gianfranco Costamagna
37eb22ad55
Delete Ubuntu Vivid, EOL
...
Ubuntu Vivid is not supported anymore.
2016-01-25 09:07:30 +01:00
TW
20bc823592
Merge pull request #594 from ThomasWaldmann/update-changes10
...
update CHANGES for 1.0
2016-01-25 00:16:26 +01:00
Herover
7cb6b5657a
Fix dead link to license
2016-01-24 19:26:05 +01:00
Thomas Waldmann
d2bfa24814
update CHANGES
2016-01-24 17:54:36 +01:00
TW
0ec998cb3b
Merge pull request #505 from ThomasWaldmann/prep-rel1
...
Prepare release 1.0
2016-01-24 16:45:03 +01:00
Thomas Waldmann
3476fffe7d
remove deprecated "--compression <number>"
...
use --compression zlib,<number> instead
in case of 0, you could also use --compression none
2016-01-24 16:04:00 +01:00
Thomas Waldmann
ad31fcd7c0
remove deprecated "--hourly/daily/weekly/monthly/yearly"
...
use --keep-hourly/daily/weekly/monthly/yearly instead
note: kept the code and test, we might have deprecated option in future, too
2016-01-24 16:04:00 +01:00
Thomas Waldmann
079646ee4c
remove deprecated "--do-not-cross-mountpoints"
...
use --one-file-system instead
2016-01-24 16:04:00 +01:00
Thomas Waldmann
e1515ee251
remove deprecated "borg verify"
...
use borg extract --dry-run ...
2016-01-24 16:04:00 +01:00
Thomas Waldmann
1fc99ec9cd
update docs, remove references to passphrase mode
2016-01-24 16:04:00 +01:00
Thomas Waldmann
815d2e23ce
remove support for --encryption=passphrase, clean up
2016-01-24 16:04:00 +01:00
Thomas Waldmann
2f9b643edb
migrate-to-repokey command, dispatch passphrase type to repokey handler
...
every chunk has the encryption key type as first byte and we do not want to rewrite the whole repo
to change the passphrase type to repokey type. thus we simply dispatch this type to repokey
handler.
if there is a repokey that contains the same secrets as they were derived from the passphrase, it will just work.
if there is none yet, one needs to run migrate-to-repokey command to create it.
2016-01-24 16:04:00 +01:00
Thomas Waldmann
b2dedee3c8
refactor yes(), cleanup env var semantics, fixes #355
...
refactorings:
- introduced concept of default answer:
if the answer string is in the defaultish sequence, the return value of yes() will be the default.
e.g. if just pressing <enter> when asked on the console or if an empty string or "default" is
in the environment variable for overriding.
if an environment var has an invalid value and no retries are enabled: return default
if retries are enabled, next retry won't use the env var again, but either ask via input().
- simplify:
only one default - this should be a SAFE default as it is used in some special conditions
like EOF or invalid input with retries disallowed.
no isatty() magic, the "yes" shell command exists, so we could receive input even if it is not from a tty.
- clean:
separate retry flag from retry_msg
2016-01-24 16:04:00 +01:00
Thomas Waldmann
6d615ec30a
change encryption to be on by default (repokey mode)
...
it's 2015, let's be safe-by-default and unsafe-as-option.
also: show default mode in builtin help
2016-01-24 15:44:09 +01:00
Thomas Waldmann
169634f2ca
change the builtin default for --chunker-params, create 2MiB chunks, fixes #343
...
one of the biggest issues with borg < 1.0 was that it had a default target chunk
size of 64kiB, thus it created a lot of chunks, a huge chunk management overhead
(high RAM and disk usage).
2016-01-24 15:44:09 +01:00
Thomas Waldmann
5607e5aefe
use os.urandom instead of own cython openssl RAND_bytes wrapper, fixes #493
2016-01-24 15:40:04 +01:00
Thomas Waldmann
3ade3d8a41
use hashlib.pbkdf2_hmac from py stdlib instead of own openssl wrapper
...
this is available in python 3.4+.
note:
before removing the pbkdf tests, i ran them with the pbkdf from stdlib to make sure it gives same result.
long term testing of this now belongs into stdlib tests, not into borg.
2016-01-24 15:40:04 +01:00
Thomas Waldmann
2cc0225527
use hmac.compare_digest instead of == operator
...
this is available in python 3.3+
2016-01-24 15:40:04 +01:00
Thomas Waldmann
9fa18c9ee9
use stat.filemode instead of homegrown code
2016-01-24 15:40:04 +01:00
Thomas Waldmann
7c8bfe6681
__file__ is now always an absolute path (3.4)
2016-01-24 15:36:04 +01:00
Thomas Waldmann
0be62d4233
stuff found on "Porting to Python 3.3"
2016-01-24 15:36:04 +01:00
Thomas Waldmann
8e13d315bb
use PyMemoryView_FromMemory (py 3.3+)
2016-01-24 15:36:04 +01:00
Thomas Waldmann
ef00f5d12d
we always have shutil.get_terminal_size on py 3.3+
2016-01-24 15:36:04 +01:00
Thomas Waldmann
fc326df600
a2b_base64 now also accepts ascii-only str objects
2016-01-24 15:36:04 +01:00
Thomas Waldmann
fc52101d46
suppress unneeded exception context (PEP 409)
2016-01-24 15:36:04 +01:00
Thomas Waldmann
a6f9c29dfe
use new OS and IO exception hierarchy of py 3.3
2016-01-24 15:36:04 +01:00
Thomas Waldmann
19729d3983
requirements: use latest pytest-cov, not blocked by py32 any more
...
also: pytest-benchmark 3.x is released, just use latest
2016-01-24 15:16:05 +01:00
Thomas Waldmann
4444113414
remove misc. compat code not needed for py 3.4+
2016-01-24 15:16:05 +01:00
Thomas Waldmann
6a5629226f
simplify to print(...., flush=True)
2016-01-24 15:16:05 +01:00