Commit Graph

4822 Commits

Author SHA1 Message Date
Thomas Waldmann 0943f2235e mention "!" (exclude-norecurse) type in patterns help
(cherry picked from commit 36f2a4e1dc)
2017-11-03 18:29:56 +01:00
Thomas Waldmann 338f56b97d don't do stat() when not recursing into excluded dir, fixes #3209
also: fix exception handling for the stat() calls

just moving all these lines into the "try"-block below (like it was in 1.0).

(cherry picked from commit 0c410e84fe)
2017-11-03 18:29:21 +01:00
Thomas Waldmann a43e2c3043 remove evil trailing comma, fixes #3244
value type of compatMap is a tuple of strings.

due to the trailing comma, this was a 1-tuple of a tuple of strings.

(cherry picked from commit 117d30d171)
2017-11-02 17:34:41 +01:00
TW 7b15b37526
Merge pull request #3232 from ThomasWaldmann/flake8-fix-1.1
flake8: add some ignores
2017-10-29 12:33:01 +01:00
Thomas Waldmann 94fa3fae3f flake8: add some ignores
(cherry picked from commit bb1c7a7f57)
2017-10-29 11:45:30 +01:00
TW 7060fd23ec Merge pull request #3222 from milkey-mouse/fix-keyfile-1.1
Clarify using a blank passphrase in keyfile mode (1.1 backport)
2017-10-26 08:05:36 +02:00
Milkey Mouse 5b7d4392dc
Clarify using a blank passphrase in keyfile mode 2017-10-25 22:42:27 -07:00
TW c2fd187cd8 Merge pull request #3204 from borgbackup/rel111
release 1.1.1
2017-10-22 23:30:27 +02:00
Thomas Waldmann 5ce4fa9704 arg parsing: fix fallback function, refactor, fixes #3205
This is a fixup for #3155, which was broken on at least python <= 3.4.2.

Also clarify when to use which *func in set_defaults.
2017-10-22 17:34:02 +02:00
Thomas Waldmann 23ac694e3d build_man 2017-10-22 03:19:23 +02:00
Thomas Waldmann f53bd78b33 build_usage 2017-10-22 03:18:40 +02:00
TW 859cf2a44e Merge pull request #3165 from ThomasWaldmann/update-changes-1.1
update CHANGES (1.1-maint)
2017-10-22 03:10:08 +02:00
Thomas Waldmann 8ade3a960a update CHANGES (1.1-maint) 2017-10-22 02:54:58 +02:00
TW cb7a6252a3 Merge pull request #3203 from ThomasWaldmann/fix-4args-open-1.1
fix server-side IndexError for 4-arg open() of old clients, fixes #3192
2017-10-22 02:21:41 +02:00
Thomas Waldmann 2aa676f85c fix server-side IndexError for 4-arg open() of old clients, fixes #3192
borg 1.1(.0) server didn't support the 4 argument open() calls made
by < 1.0.7 clients.

(cherry picked from commit dbcc870489)
2017-10-22 00:48:51 +02:00
TW 8304b0798a Merge pull request #3199 from ThomasWaldmann/show-excluded-dirs-1.1
show excluded dir with "x" for tagged dirs / caches, fixes #3189
2017-10-20 23:55:57 +02:00
TW b994e9c9c1 Merge pull request #3200 from ThomasWaldmann/keyfile-abspath-1.1
fix crash with relative BORG_KEY_FILE, fixes #3197
2017-10-20 23:43:46 +02:00
Thomas Waldmann 6d67a9f874 fix crash with relative BORG_KEY_FILE, fixes #3197
(cherry picked from commit 7136e2c93c)
2017-10-20 23:42:35 +02:00
Thomas Waldmann 75004e9065 show excluded dir with "x" for tagged dirs / caches, fixes #3189
(cherry picked from commit 93de42bb25)
2017-10-20 21:29:36 +02:00
TW 40186a3ffc Merge pull request #3185 from ThomasWaldmann/hardlinked-symlink-warning-1.1
remove hardlinked symlinks warning, update docs, fixes #3175
2017-10-17 21:54:25 +02:00
Thomas Waldmann d535c6a25d remove hardlinked symlinks warning, update docs, fixes #3175
the warning was annoying for people with a lot of such items and
they can not do anything about it anyway.

thus, just document this as a limitation.

(cherry picked from commit e674822888)
2017-10-17 21:39:51 +02:00
TW 7b33de2194 Merge pull request #3184 from ThomasWaldmann/no-bsdflags-1.1
implement --nobsdflags and --exclude-nodump, fixes #3160
2017-10-17 21:26:58 +02:00
Thomas Waldmann 229a117ceb implement --nobsdflags and --exclude-nodump, fixes #3160
do no read/archive bsdflags: borg create --nobsdflags ...
do not extract/set bsdflags: borg extract --nobsdflags ...

use cases:

- fs shows wrong / random bsdflags (bug in filesystem)
- fs does not support bsdflags anyway
- already archived bsdflags are wrong / unwanted
- borg shows any sort of unwanted effect due to get_flags, esp. on Linux

the nodump flag ("do not backup this file") is not honoured any more by
default because this functionality (esp. if it happened by error or
unexpected) was rather confusing and unexplainable at first to users.

if you want that "do not backup NODUMP-flagged files" behaviour, use:
borg create --exclude-nodump ...

(cherry picked from commit 10adadf685)
2017-10-17 19:36:49 +02:00
TW 01cfba175c Merge pull request #3168 from ThomasWaldmann/security-use-savefile-1.1
cache: use SaveFile for more safety, fixes #3158
2017-10-15 02:29:21 +02:00
Thomas Waldmann 386e4cee59 cache: use SaveFile for more safety, fixes #3158
Looks like under unfortunate circumstances, these files could become
0 byte files (see #3158). SaveFile usage should prevent that.

(cherry picked from commit 0190abff81)
2017-10-15 01:26:17 +02:00
TW 38b2d064d4 Merge pull request #3166 from ThomasWaldmann/fix-recreate-part-size-1.1
borg recreate: correctly compute part file sizes, fixes #3157
2017-10-14 21:08:31 +02:00
Thomas Waldmann 9a6da1d65e borg recreate: correctly compute part file sizes, fixes #3157
when doing in-file checkpointing, borg creates *.borg_part_N files.
complete_file = part_1 + part_2 + ... + part_N

the source item for recreate already has a precomputed (total) size
member, thus we must force recomputation from the (partial) chunks
list to correct the size to be the part's size only.

borg create avoided this problem by computing the size member after
writing all the parts. this is now not required any more.

the bug is mostly cosmetic, borg check will complain, borg extract on
a part file would also complain. but all the complaints only refer to
the wrong metadata of the part files, the part files' contents are
correct.

usually you will never extract or look at part files, but only deal
with the full file, which will be completely valid, all metadata and
content.

you can get rid of the archives with these cosmetic errors by running
borg recreate on them with a fixed borg version. the old part files
will get dropped (because they are usually ignored) and any new part
file created due to checkpointing will be correct.

(cherry picked from commit 9d6b125e98)
2017-10-14 19:59:38 +02:00
TW 7a05b4c960 Merge pull request #3162 from ThomasWaldmann/dont-open-special-1.1
bsdflags support: do not open BLK/CHR/LNK files, fixes #3130
2017-10-14 04:26:37 +02:00
TW bcd14647a4 Merge pull request #3161 from ThomasWaldmann/argparse-files-cache-1.1
move --no-files-cache from common to borg create options, fixes #3146
2017-10-13 23:57:17 +02:00
Thomas Waldmann e1723ec1d9 bsdflags support: do not open BLK/CHR/LNK files, fixes #3130
opening a device file for a non-existing device can be very slow.
symlinks will make the open() call fail as it is using O_NOFOLLOW.

also: lstat -> stat(..., follow_symlinks=False) like everywhere else.
(cherry picked from commit a6ee4e9aed)
2017-10-13 23:55:00 +02:00
TW e3cdd90729 move --no-files-cache from common to borg create options, fixes #3146
for borg prune, just use do_files=False (it only needs the chunks
cache, not the files cache).

(cherry picked from commit 19ed725a58)
2017-10-13 20:19:50 +02:00
TW 58c53e25ea Merge pull request #3156 from ThomasWaldmann/no-brew-update-1.1
don't brew update, hopefully fixes #2532
2017-10-13 02:38:14 +02:00
TW 17ce2f728a Merge pull request #3155 from ThomasWaldmann/maincommand-help-1.1
maincommand help 1.1
2017-10-13 01:45:19 +02:00
TW 4453807c10 Merge pull request #3154 from ThomasWaldmann/readme-encryption-options-1.1
readme: -e is required in borg 1.1
2017-10-13 00:25:17 +02:00
Thomas Waldmann aac190eae1 don't brew update, hopefully fixes #2532
(cherry picked from commit 6049a07b74)
2017-10-12 23:38:02 +02:00
Thomas Waldmann fcaf764604 add example showing --show-version --show-rc
(cherry picked from commit ed1a8b5cf1)
2017-10-12 23:34:23 +02:00
Thomas Waldmann c768999a05 don't crash if only a global option is given, show help, fixes #3142
(cherry picked from commit 3be328ed70)
2017-10-12 23:34:14 +02:00
Thomas Waldmann 7c1b08922a readme: -e is required in borg 1.1
(cherry picked from commit c8441b5b3d)
2017-10-12 23:23:12 +02:00
TW 42046524e5 Merge pull request #3133 from ThomasWaldmann/fix-nonlocal-path-detection-1.1
fix detection of non-local path, fixes #3108
2017-10-11 14:10:18 +02:00
TW 9e83632c06 Merge pull request #3132 from ThomasWaldmann/no-time-end-1.1
recreate: don't crash on attic archives w/o time_end, fixes #3109
2017-10-11 14:05:32 +02:00
TW c5b02cebc3 Merge pull request #3131 from ThomasWaldmann/support-no-hardlinks-1.1
catch ENOTSUP for os.link, fixes #3107
2017-10-11 14:05:00 +02:00
TW 8ca6dc03d2 Merge pull request #3129 from ThomasWaldmann/fallback-no-truncate-1.1
don't crash in first part of truncate_and_unlink, fixes #3117
2017-10-11 14:04:34 +02:00
TW 6f8994e4b9 Merge pull request #3134 from ThomasWaldmann/logging-config-fix-1.1
logging with fileConfig: set json attr on "borg" logger, fixes #3114
2017-10-11 14:03:22 +02:00
TW 74d3fb4943 Merge pull request #3135 from ThomasWaldmann/doc-fix-1.1
use --format rather than --list-format in examples, the latter is deprecated
2017-10-11 14:02:42 +02:00
TW 919edbffad Merge pull request #3136 from ThomasWaldmann/issue/3103-1.1
init: fix wrong encryption choices in command line parser
2017-10-11 14:02:09 +02:00
Marian Beermann ad07efcb29 init: fix wrong encryption choices in command line parser
(cherry picked from commit b00179ff78)
2017-10-11 01:18:19 +02:00
Fabio Pedretti 0e44f07b88 use --format rather than --list-format in examples, the latter is
deprecated

(cherry picked from commit bc42f58c04)
2017-10-11 01:13:12 +02:00
Thomas Waldmann edcc64aeed logging with fileConfig: set json attr on "borg" logger, fixes #3114
(cherry picked from commit afba813706)
2017-10-11 01:10:11 +02:00
Thomas Waldmann d35537c199 fix detection of non-local path, fixes #3108
filenames like ..foobar are valid, so, to detect stuff in upper dirs,
we need to include the path separator and check if it starts with '../'.

(cherry picked from commit 60e9249100)
2017-10-11 01:02:28 +02:00
Thomas Waldmann fd253a2813 recreate: don't crash on attic archives w/o time_end, fixes #3109
(cherry picked from commit 9d3daebd5f)
2017-10-11 00:56:46 +02:00