mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-28 19:01:58 +00:00
Code Issues Releases Wiki Activity
2433 commits 9 branches 139 tags 61 MiB
Commit graph

2433 commits

This branch
This branch
All branches
Author SHA1 Message Date
TW
3ff6ac09a6 Merge pull request #1179 from Abogical/list-format 
Apply --format when listing repository archives, fixes #1166
 2016-06-24 18:29:03 +02:00
Abogical
6658112f8c Add documentation for listing repository archives 2016-06-21 20:01:01 +03:00
Abogical
87173d25de Added testsuite for listing repository archives 2016-06-20 19:23:22 +03:00
Abogical
c839eb63f7 Apply --format when listing repository archives 2016-06-20 19:23:15 +03:00
Abogical
0942bcd1b4 Move code block for the write() function at do_list() 2016-06-20 16:14:52 +03:00
enkore
0b9689063d Merge pull request #1188 from jrtc27/ldpreload-eatmydata 
Correctly handle multiple LD_PRELOAD entries; fixes #1111
 2016-06-19 23:34:16 +02:00
James Clarke
d4f5172771 Correctly handle multiple LD_PRELOAD entries; fixes #1111 2016-06-19 22:04:03 +01:00
Thomas Waldmann
37835f7d6c Merge branch '1.0-maint' 2016-06-19 15:11:36 +02:00
TW
195a6b9093 Merge pull request #1186 from ThomasWaldmann/ignore-F405 
flake8: ignore F405, fixes #1185
 2016-06-19 15:09:26 +02:00
Thomas Waldmann
278cf0b9ad helpers: fix "undefined name 'e'" in exception handler 2016-06-19 14:55:57 +02:00
Thomas Waldmann
745007bd12 flake8: ignore F405, fixes #1185 
We know that star imports have their issues and we only have one of them,
for good reasons. Thus, we switch off that new F405 test/message.
 2016-06-19 14:40:11 +02:00
TW
d9a14e3658 Merge pull request #1184 from c4rlo/linux-syncfile-errno-fix 
platform.linux: small SyncFile error handling fix
 2016-06-18 14:49:18 +02:00
TW
e41ef8471e Merge pull request #1182 from c4rlo/typo-fixes 
typo fixes in comment+docstring
 2016-06-18 14:45:56 +02:00
Carlo Teubner
58d236c619 platform.linux: small SyncFile error handling fix 2016-06-18 13:39:22 +01:00
Carlo Teubner
ff470f49f3 typo fixes in comment+docstring 2016-06-18 12:57:54 +01:00
Thomas Waldmann
9a64835b4d Merge branch '1.0-maint' 
Also: add missing keys to ARCHIVE_KEYS set.
 2016-06-13 00:14:08 +02:00
enkore
22e14a0a75 Merge pull request #1160 from ThomasWaldmann/fix-1159 
Fix 1159
 2016-06-12 18:24:15 +02:00
Thomas Waldmann
69c3b5e196 rebuild_manifest: refactor archive metadata dict validation 
this was already done in a similar way for item metadata dict validation.

also: check for some more required keys - the old code would crash if 'name' or 'time' key were missing.
 2016-06-12 16:06:16 +02:00
Thomas Waldmann
03f6282eab make rebuild_manifest more future-proof 2016-06-12 15:31:31 +02:00
Thomas Waldmann
866417853d rename valid_msgpacked_item to valid_msgpacked_dict 
the code is generic, it can also be used for other msgpacked dictionaries.
 2016-06-12 15:31:31 +02:00
TW
8c26945097 Merge pull request #1158 from ThomasWaldmann/pretty-key 
add Key/EncryptedKey PropDict, see #1157
 2016-06-12 14:51:46 +02:00
TW
fa77e74908 Merge pull request #1154 from hemio-ev/uuid-format-tags 
Adds uuid to archive format tags
 2016-06-12 14:48:17 +02:00
enkore
90d621ce35 Merge pull request #1149 from ThomasWaldmann/validkeys-in-manifest 
item_keys in manifest, validate item keys
 2016-06-12 14:44:27 +02:00
Thomas Waldmann
d2468d37df add Key/EncryptedKey PropDict 2016-06-12 04:28:40 +02:00
Thomas Waldmann
a7b5165149 better validation of item metadata dicts, fixes #1130 
the previous check only checked that we got a dict, but did not validate the dict keys.
this triggered issues with e.g. (invalid) integer keys.

now it validates the keys:
- some required keys must be present
- the set of keys is a subset of all valid keys
 2016-06-12 00:11:31 +02:00
Thomas Waldmann
78121a8d04 store item_keys into manifest, fixes #1147 
we need a list of valid item metadata keys. using a list stored in the repo manifest
is more future-proof than the hardcoded ITEM_KEYS in the source code.

keys that are in union(item_keys_from_repo, item_keys_from_source) are considered valid.
 2016-06-12 00:11:10 +02:00
Michael Herold
d45a13babf Changes archive format from uuid to uuid4 
This allows for future support of other uuid versions
 2016-06-11 22:57:03 +02:00
TW
4c98b91e12 Merge pull request #1153 from witten/patch-2 
Update resources.rst to rename atticmatic to borgmatic
 2016-06-11 18:28:00 +02:00
Michael Herold
5aa97e283c Adds uuid to archive format tags 2016-06-11 12:03:55 +02:00
Dan Helfman
7642632359 Update resources.rst to rename atticmatic to borgmatic 
atticmatic wrapper script has been renamed to borgmatic!
 2016-06-10 19:27:19 -07:00
TW
34d07d1526 Merge pull request #1150 from enkore/fix/solaris 
Fix test_sparse_file for solaris
 2016-06-10 21:09:44 +02:00
jenkins
b86775ab4f
Fix test_sparse_file for solaris 2016-06-10 12:21:03 +02:00
TW
d9b77d57c8 Merge pull request #1148 from ThomasWaldmann/fix-1135 
fix resync and msgpacked item qualifier, fixes #1135
 2016-06-09 22:08:55 +02:00
Thomas Waldmann
918e0b2a52 fix resync and msgpacked item qualifier, fixes #1135 
when trying to resync and skip invalid data, borg tries to qualify a byte sequence as
valid-looking msgpacked item metadata dict (or not) before even invoking msgpack's unpack.

besides previously hard to understand code, there were 2 issues:

- a missing check for map16 - this type is what msgpack uses if the dict has more than
15 items (could happen in future, not for 1.0.x).

- missing checks for str8/16/32 - str16 is what msgpack uses if the bytestring has more than 31 bytes
(borg does not have that long key names, thus this wasn't causing any harm)

this misqualification (valid data considered invalid) could lead to a wrong resync, skipping valid items.

added more comments and tests.
 2016-06-09 22:08:06 +02:00
TW
b5b4a72fa6 Merge pull request #1137 from ThomasWaldmann/no-manifest 
better error handling for missing repo manifest, fixes #1043
 2016-06-09 21:41:02 +02:00
Thomas Waldmann
e10d543ef4 delete a repo without manifest 2016-06-09 20:43:13 +02:00
Thomas Waldmann
6a70d9968c make borg check work for empty repo 2016-06-09 20:43:13 +02:00
Thomas Waldmann
7501c3b530 better error handling for missing repo manifest, fixes #1043 
can happen for not correctly initialized repos or corrupted repos.

here: borg list failing more pretty
 2016-06-09 20:43:13 +02:00
Thomas Waldmann
d813775065 Merge branch '1.0-maint' 2016-06-09 20:29:44 +02:00
Thomas Waldmann
9ef565b00e Merge branch '1.0-maint' 2016-06-09 20:21:48 +02:00
TW
a8c4c9ffab Merge pull request #1144 from ThomasWaldmann/fix-prune-docs 
fix / clarify prune help, fixes #1143
 2016-06-06 16:12:46 +02:00
Thomas Waldmann
fb89152392 fix / clarify prune help, fixes #1143 2016-06-06 16:11:22 +02:00
TW
ee5e89b575 Merge pull request #1136 from ThomasWaldmann/env-security-cleanup 
remove passphrase from subprocess environment, fixes #1105
 2016-06-05 13:29:52 +02:00
Thomas Waldmann
ca35d9f255 remove passphrase from subprocess environment, fixes #1105 2016-06-05 00:25:30 +02:00
TW
808379921c Merge pull request #1134 from enkore/fix/SyncFileX 
SyncFile: open with O_EXCL (or equivalent)
 2016-06-04 23:33:59 +02:00
Marian Beermann
e41f3ecc5b
SyncFile: open with O_EXCL (or equivalent) 2016-06-04 22:47:27 +02:00
TW
62a2a7302e Merge pull request #1132 from ThomasWaldmann/fuse-changes 
fuse: simplify timestamp processing
 2016-06-04 18:21:53 +02:00
TW
504af0206d Merge pull request #1117 from ThomasWaldmann/items-refactor 
refactor to use Item class
 2016-06-04 17:51:08 +02:00
Thomas Waldmann
75244ea6d1 fuse: simplify timestamp processing 2016-06-04 17:34:03 +02:00
Thomas Waldmann
60da32123a refactor to use Item class, fixes #1071 2016-06-04 17:24:55 +02:00