1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 17:57:59 +00:00
Commit graph

4571 commits

Author SHA1 Message Date
enkore
11653d8bc2 Merge pull request #2920 from lfos/detect-attic-repos
Detect non-upgraded Attic repositories
2017-08-16 17:47:02 +02:00
Lukas Fleischer
0943b322e3 Detect non-upgraded Attic repositories
When opening a repository, always try to read the magic number of the
latest segment and compare it to the Attic segment magic (unless the
repository is opened for upgrading). If an Attic segment is detected,
raise a dedicated exception, telling the user to upgrade the repository
first.

Fixes #1933.
2017-08-15 19:58:30 +02:00
rugk
df8205a4ba Renew asciinema/screencasts
Created with borg v1.1.0, so more up-to-date and split into different
parts (install, basic, advanced)…
Fixes https://github.com/borgbackup/borg/issues/669
2017-08-14 21:07:52 +02:00
TW
9d758d56cd Merge pull request #2924 from ThomasWaldmann/migrate-locks
migrate locks to child PID when daemonize is used
2017-08-13 19:49:37 +02:00
Thomas Waldmann
5bad764637 fixup: use asserts for the old_id check 2017-08-11 23:24:33 +02:00
Thomas Waldmann
6f94949a36 migrate locks to child PID when daemonize is used
also:

increase platform api version due to change in get_process_id behaviour.
2017-08-08 03:46:44 +02:00
TW
72c8ec2583 Merge pull request #2928 from ThomasWaldmann/json-isoformat
Json isoformat
2017-08-08 01:46:13 +02:00
Thomas Waldmann
6d2b3bc7cd test json timestamps for iso format 2017-08-07 23:35:10 +02:00
Thomas Waldmann
6133f1bb60 repo last_modified: use iso8601 timestamp format with --json
like yyyy-mm-ddThh:mm:ss - no tz yet, this likely needs more refactoring
to tz aware and utc datetime objects everywhere, currently there are
naive datetime objects and also localtime at quite some places.
2017-08-07 23:35:10 +02:00
Thomas Waldmann
1df7af58ae archives list: use iso8601 timestamp format with --json
like yyyy-mm-ddThh:mm:ss - no tz yet, this likely needs more refactoring
to tz aware and utc datetime objects everywhere, currently there are
naive datetime objects and also localtime at quite some places.
2017-08-07 23:35:10 +02:00
Thomas Waldmann
09c111bb44 archive listing: use iso8601 timestamp format with --json-lines
like yyyy-mm-ddThh:mm:ss - no tz yet, this likely needs more refactoring
to tz aware and utc datetime objects everywhere, currently there are
naive datetime objects and also localtime at quite some places.
2017-08-07 23:35:10 +02:00
TW
70c7f481fc Merge pull request #2905 from ThomasWaldmann/refactor-helpers
Refactor helpers
2017-08-07 23:06:15 +02:00
Thomas Waldmann
3e78549f76 helpers: split into smaller modules 2017-08-07 23:05:46 +02:00
Thomas Waldmann
a5f7c7a1ce helpers: fix imports and helpers.exit_code location
code expects to be able to assign to helpers.exit_code (which stopped
working correctly when exit_code was moved to helpers.misc module).
2017-08-07 23:05:46 +02:00
Thomas Waldmann
558282df58 helpers: create package
just created package dir and __init__.py and
moved helpers.py to helpers/misc.py - no other changes.

not functional, some imports need fixing...
2017-08-07 23:05:45 +02:00
enkore
a1840e9238 Merge pull request #2918 from ThomasWaldmann/fix-serve-exitcode
fix exitcode of borg serve, fixes #2910
2017-08-06 10:56:34 +02:00
Thomas Waldmann
583de3eeb1 fix exitcode of borg serve, fixes #2910 2017-08-06 04:18:49 +02:00
TW
eee4542f3b Merge pull request #2900 from imsodin/fix-2899
Only compare contents when chunker params match (fixes #2899)
2017-08-06 01:20:24 +02:00
TW
5a7614012d Merge pull request #2906 from ThomasWaldmann/vagrant-archlinux
vagrant: add archlinux VM
2017-08-03 04:59:58 +02:00
Thomas Waldmann
7dc76a7f40 vagrant: add archlinux VM
has python 3.6, openssl 1.1.

and most of the stuff we need is preinstalled on this box. \o/
2017-08-01 04:46:31 +02:00
Simon Frei
b6c2055276 Only compare contents when chunker params match (fixes #2899) 2017-07-30 21:39:35 +02:00
enkore
4f57e3a7c4 Merge pull request #2890 from enkore/f/mt-1c
archive: create FilesystemObjectProcessors class
2017-07-30 18:22:50 +02:00
enkore
d968eae4e5 Merge pull request #2892 from ThomasWaldmann/drop-py34
increase Python minimum requirement to 3.5.0
2017-07-30 10:25:09 +02:00
Thomas Waldmann
074beec1ca minimal Vagrantfile (py3.5+, openssl 1.0/1.1)
- killed many VMs that missed python 3.5 and/or openssl 1.1
- refer to 1.1-maint branch Vagrantfile if you want to re-add some
- kept xenial64 for openssl 1.0 testing
- kept stretch64 for openssl 1.1 testing and future binary builds
2017-07-30 02:01:10 +02:00
Thomas Waldmann
12df5e625a use python 3.5's os.scandir
the removed stuff was only required for < 3.5.
2017-07-29 21:13:57 +02:00
Thomas Waldmann
4c840ee24d use python 3.5's os.set_blocking 2017-07-29 21:13:57 +02:00
Thomas Waldmann
8cd451bd33 python 3.5+ does not generate .pyo any more 2017-07-29 21:13:57 +02:00
Thomas Waldmann
75050f4ba0 travis has fixed their py 3.5
lzma stuff used to be broken, that's why we had 3.5.2.
2017-07-29 21:13:47 +02:00
Thomas Waldmann
a5c6a50ebe increase Python minimum requirement to 3.5.0
also:
- drop testing on 3.4
- add some TODO for the docs and vagrant machines
2017-07-29 20:55:04 +02:00
Marian Beermann
a88519d540 archive: delete unused Archive.list_archives 2017-07-29 19:37:37 +02:00
Marian Beermann
c93dba0195 archive: create FilesystemObjectProcessors class 2017-07-29 19:37:37 +02:00
enkore
bccff3413b Merge pull request #2889 from enkore/f/mt-1b
multithreading: item.to_optr(), Item.from_optr()
2017-07-29 17:27:18 +02:00
Marian Beermann
d286d753cb item: item.to_optr(), Item.from_optr() 2017-07-29 17:26:39 +02:00
enkore
7b35b1ef24 Merge pull request #2888 from enkore/f/remove-gcm
crypto: fixes & remove AES-GCM
2017-07-29 17:24:16 +02:00
enkore
5abfa0b266 Merge pull request #2887 from enkore/f/mt-1a
multithreading: add pyzmq dep, chunker GIL
2017-07-29 14:36:01 +02:00
Marian Beermann
e57dd4bc9e crypto: avoid bad prototype codegen from cython
(-Wstrict-prototypes, Cyton forgets a "void")
2017-07-29 12:28:33 +02:00
Marian Beermann
630e45b742 crypto: fix wrong use of const 2017-07-29 12:28:06 +02:00
Marian Beermann
d5ee16d676 crypto: remove AES-GCM 2017-07-29 12:22:11 +02:00
enkore
7d02c7e453 Merge pull request #1034 from ThomasWaldmann/crypto-aead
new crypto code, blackbox, aead internally
2017-07-29 12:18:38 +02:00
Marian Beermann
55e0c43c53 add zeromq dependency 2017-07-29 11:58:01 +02:00
Marian Beermann
b1b66be593 fix chunker holding the GIL during blocking I/O 2017-07-29 11:58:01 +02:00
Thomas Waldmann
dc4abffbc0 remove unused bytes16 conversions 2017-07-27 23:48:30 +02:00
Thomas Waldmann
63ebfc140b remove unused extract_nonce method 2017-07-27 23:48:30 +02:00
Thomas Waldmann
e7228fa3a4 cosmetic: move some lines 2017-07-27 23:48:30 +02:00
Thomas Waldmann
68ef5e8a4b allow different MACs, implement blake2b MAC 2017-07-27 23:48:30 +02:00
Thomas Waldmann
945b5e25e2 dispatch to dummy blake2b ciphersuite 2017-07-27 23:48:30 +02:00
Thomas Waldmann
1e23291b7f post-merge: re-enabled AuthenticatedKey and tests 2017-07-27 23:48:30 +02:00
Thomas Waldmann
6090fdeef3 move the cipher internal counter overflow check to encrypt()/decrypt() 2017-07-27 23:48:30 +02:00
Thomas Waldmann
8f1678e2ba set_iv / next iv with integers 2017-07-27 23:48:30 +02:00
Thomas Waldmann
58c2dafbe0 nonce manager: remove get/set iv, make it integer based 2017-07-27 23:48:30 +02:00