Commit graph

4792 commits

Author SHA1 Message Date
TW
3c68040c50
Merge pull request #3240 from Anakonda/updateWindows
Update windows branch
2017-11-01 15:03:39 +01:00
Antti Aalto
f252f6f6d7 Appveyor build number. 2017-10-31 22:03:54 +02:00
Antti Aalto
f3543c28fd Minor Windows fixes. 2017-10-31 17:20:25 +02:00
Antti Aalto
401155e909 Fix windows deployment. 2017-10-30 18:43:21 +02:00
Antti Aalto
cb699ce32b Appveyor: Set proper version. 2017-10-30 18:05:05 +02:00
Antti Aalto
38d2f1efd6 Fix windows absolute paths. 2017-10-30 17:21:44 +02:00
Antti Aalto
248eb605b6 Fix building standalone windows exe. 2017-10-30 14:12:55 +02:00
Antti Aalto
9fe09c831f Fix windows build after merge with master. 2017-10-30 14:11:06 +02:00
Antti Aalto
583d51785e Merge windows branch with master 2017-10-30 12:08:11 +02:00
TW
c640e3815b
Merge pull request #3236 from narendravardi/borg_config_dir_documentation
Added documentation for BORG_CONFIG_DIR
2017-10-30 06:49:43 +01:00
narendravardi
764a62f42c Added documentation for BORG_CONFIG_DIR 2017-10-29 21:52:33 +05:30
TW
2b79aade36
Merge pull request #3231 from ThomasWaldmann/flake8-fix
flake8: add some ignores
2017-10-29 11:44:39 +01:00
Thomas Waldmann
bb1c7a7f57 flake8: add some ignores 2017-10-29 11:39:13 +01:00
TW
926b1c6374
Merge pull request #3212 from ThomasWaldmann/stat-after-match
don't do stat() when not recursing into excluded dir, fixes #3209
2017-10-28 13:31:47 +02:00
TW
c0b9058759 Merge pull request #3217 from narendravardi/add_borg_config_dir
add BORG_CONFIG_DIR env, fixes #3083
2017-10-27 11:34:29 +02:00
TW
5b1a170ec2 Merge pull request #3219 from milkey-mouse/keyfile-docs
Clarify using a blank passphrase in keyfile mode
2017-10-26 07:29:57 +02:00
Milkey Mouse
87a9952f3b
Clarify using a blank passphrase in keyfile mode 2017-10-25 19:42:02 -07:00
Narendra Vardi
a3f1e6e250 added unittest for get_config_dir function 2017-10-25 23:07:45 +05:30
Narendra Vardi
56fed4f964 add BORG_CONFIG_DIR env (#3083) 2017-10-24 08:34:35 +05:30
Thomas Waldmann
36f2a4e1dc mention "!" (exclude-norecurse) type in patterns help 2017-10-24 03:18:40 +02:00
Thomas Waldmann
0c410e84fe 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).
2017-10-24 03:17:41 +02:00
TW
46c071ca47 Merge pull request #3208 from ThomasWaldmann/fix-3205-master
arg parsing: fix fallback function, refactor, fixes #3205
2017-10-23 14:33:18 +02:00
Thomas Waldmann
ae91aff681 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.

(cherry picked from commit 5ce4fa9704)
2017-10-22 23:45:04 +02:00
TW
152bb27663 Merge pull request #3193 from ThomasWaldmann/fix-4args-open
fix server-side IndexError for 4-arg open() of old clients, fixes #3192
2017-10-22 00:45:35 +02:00
TW
1d6ed506f1 Merge pull request #3198 from ThomasWaldmann/keyfile-abspath
fix crash with relative BORG_KEY_FILE, fixes #3197
2017-10-20 23:41:04 +02:00
TW
24fefbb0e0 Merge pull request #3190 from ThomasWaldmann/show-excluded-dirs
show excluded dir with "x" for tagged dirs / caches, fixes #3189
2017-10-20 21:16:51 +02:00
Thomas Waldmann
7136e2c93c fix crash with relative BORG_KEY_FILE, fixes #3197 2017-10-20 21:13:11 +02:00
TW
c91509e72b Merge pull request #3194 from Baughn/patch-1
Add Nix/NixOS install command
2017-10-20 18:46:10 +02:00
Svein Ove Aas
98443f15d5 Add Nix/NixOS install command 2017-10-20 17:08:10 +01:00
Thomas Waldmann
dbcc870489 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.
2017-10-20 16:47:32 +02:00
Thomas Waldmann
93de42bb25 show excluded dir with "x" for tagged dirs / caches, fixes #3189 2017-10-20 04:54:09 +02:00
TW
38dd1f11ac Merge pull request #3181 from ThomasWaldmann/hardlinked-symlink-warning
remove hardlinked symlink warning, update docs
2017-10-17 21:30:53 +02:00
TW
c38657549e Merge pull request #3164 from ThomasWaldmann/no-bsdflags
implement --nobsdflags and --exclude-nodump
2017-10-17 18:49:57 +02:00
Thomas Waldmann
10adadf685 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 ...
2017-10-17 18:45:32 +02:00
Thomas Waldmann
e674822888 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.
2017-10-17 18:34:32 +02:00
TW
ac0ad9adf0 Merge pull request #3167 from ThomasWaldmann/security-use-savefile
cache: use SaveFile for more safety, fixes #3158
2017-10-15 01:24:36 +02:00
Thomas Waldmann
0190abff81 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.
2017-10-15 00:39:39 +02:00
TW
6096ff9ad6 Merge pull request #3163 from ThomasWaldmann/fix-recreate-part-size
borg recreate: correctly compute part file sizes, fixes #3157
2017-10-14 19:52:02 +02:00
Thomas Waldmann
9d6b125e98 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.
2017-10-14 04:24:26 +02:00
TW
8909ffc71a Merge pull request #3137 from ThomasWaldmann/dont-open-special
bsdflags support: skip blk/chr/lnk file type, fixes #3130
2017-10-13 23:54:03 +02:00
Thomas Waldmann
a6ee4e9aed 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.
2017-10-13 23:53:22 +02:00
TW
19ed725a58 move files-cache related options to borg create, fixes #3146 (#3147)
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).
2017-10-13 20:16:30 +02:00
TW
de175a7ed1 Merge pull request #3148 from ThomasWaldmann/maincommand-help
don't crash if only a global option is given, show help, fixes #3142
2017-10-12 20:32:35 +02:00
TW
5709e7394b Merge pull request #3145 from ThomasWaldmann/no-brew-update
don't brew update, hopefully fixes #2532
2017-10-12 20:28:08 +02:00
TW
f554f748ed Merge pull request #3150 from ThomasWaldmann/readme-encryption-options
readme: -e is required in borg 1.1
2017-10-12 17:07:43 +02:00
Thomas Waldmann
c8441b5b3d readme: -e is required in borg 1.1 2017-10-12 16:14:32 +02:00
Thomas Waldmann
ed1a8b5cf1 add example showing --show-version --show-rc 2017-10-12 06:03:12 +02:00
Thomas Waldmann
3be328ed70 don't crash if only a global option is given, show help, fixes #3142 2017-10-12 05:40:52 +02:00
Thomas Waldmann
6049a07b74 don't brew update, hopefully fixes #2532 2017-10-12 03:37:48 +02:00
TW
c8bf9dba4a Merge pull request #3122 from ThomasWaldmann/logging-config-fix
logging with fileConfig: set json attr on "borg" logger, fixes #3114
2017-10-11 01:08:31 +02:00