1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Commit graph

2682 commits

Author SHA1 Message Date
Thomas Waldmann
57402b120b vagrant: no chown when rsyncing
it tries to do chown -R vagrant.vagrant, but some boxes do not
have a vagrant group and break there. also, we do our own chown
in the provisioning scripts.
2016-10-17 17:37:33 +02:00
TW
cf9e7adb9f Merge pull request #1733 from ThomasWaldmann/update-usage
Update usage.rst / api.rst
2016-10-17 04:13:22 +02:00
Thomas Waldmann
3550b24ed9 ran build_usage 2016-10-17 03:59:47 +02:00
Thomas Waldmann
b3133f6394 update api.rst 2016-10-17 03:58:22 +02:00
TW
dc596e8cfb Merge pull request #1731 from ThomasWaldmann/update-1.0-changes
update 1.0-maint CHANGES
2016-10-17 03:53:16 +02:00
Thomas Waldmann
4d7af95ad2 update 1.0 CHANGES 2016-10-17 03:50:47 +02:00
TW
6de09859e0 Merge pull request #1732 from ThomasWaldmann/debug-obj-refcount
add borg debug refcount-obj ID subcommand
2016-10-17 03:46:10 +02:00
Thomas Waldmann
498e71846c add borg debug refcount-obj ID subcommand 2016-10-17 03:19:43 +02:00
TW
48bcd2aa9a Merge pull request #1730 from ThomasWaldmann/fix-vagrant-netbsd
vagrant / netbsd: use own box, fixes #1671, fixes #1728
2016-10-17 02:04:41 +02:00
Thomas Waldmann
63ff002b19 vagrant / netbsd: use own box, fixes #1671, fixes #1728
self-made basic netbsd box includes pre-installed rsync as vagrant is unable to install rsync.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on netbsd).
2016-10-17 02:03:52 +02:00
enkore
1166ade6ed Merge pull request #1685 from enkore/f/remote-excs
fix debug get-obj / delete-obj crash if object not found and remote repo
2016-10-15 21:30:47 +02:00
TW
274d891f14 Merge pull request #1724 from ThomasWaldmann/fix-vagrant-openbsd
vagrant / openbsd: use own box, fixes #1695
2016-10-15 17:07:40 +02:00
Thomas Waldmann
4ca0ed150b vagrant / openbsd: use own box, fixes #1695
self-made basic openbsd box includes pre-installed rsync as vagrant is unable to install rsync.
as the self-made box now has enough space on /, remove workaround for low space.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on openbsd).
2016-10-15 15:21:38 +02:00
TW
00f1dcf366 Merge pull request #1711 from ThomasWaldmann/ssh-url-relative-path
implement /./relpath hack
2016-10-15 01:27:36 +02:00
Thomas Waldmann
e829e8372d implement /./relpath hack, fixes #1655 2016-10-15 00:57:27 +02:00
enkore
12a127ace1 Merge pull request #1719 from ThomasWaldmann/clean_env_10
Clean env in 1.0
2016-10-14 10:37:23 +02:00
Thomas Waldmann
2b27a06595 use monkeypatch to set env vars
but only on pytest based tests.
2016-10-14 04:44:06 +02:00
Thomas Waldmann
2679963cb9 add conftest.py hack needed for borg 1.0.x 2016-10-14 04:42:13 +02:00
Thomas Waldmann
f3efcdbd2e point XDG_*_HOME to temp dirs for tests, fixes #1714
otherwise it spoils the user's nonces and cache dirs with lots of files.

also: remove all BORG_* env vars from the outer environment

fix get_*_dir tests to use monkeypatch.
2016-10-14 00:46:43 +02:00
enkore
dda439be57 Merge pull request #1713 from ThomasWaldmann/fuse_mount-flexibility
fuse_mount contextmanager: accept any options
2016-10-13 10:47:13 +02:00
Thomas Waldmann
8d9475f704 fuse_mount contextmanager: accept any options
not just the -o mount_options, but any options borg mount would take.
simpler, more flexible.
2016-10-13 03:53:26 +02:00
TW
f7d20f8eee Merge pull request #1710 from ThomasWaldmann/path-with-colon
allow pathes with colons, fixes #1705
2016-10-13 00:19:52 +02:00
Thomas Waldmann
546c77f73d ssh:// Location URL - remove not needed #
nobody could make sense of it, so guess it is a mistake.
2016-10-12 23:10:38 +02:00
Thomas Waldmann
e9ba14c686 Location parsing regexes: use verbose REs
just added whitespace and comments, no semantic changes
2016-10-12 23:10:38 +02:00
Thomas Waldmann
cf0359eba7 allow pathes with colons, fixes #1705
also:
- refactor / deduplicate the location parsing regexes
- add comments
- add more tests for Location parsing
2016-10-12 22:57:23 +02:00
enkore
7a83bea0e8 Merge pull request #1690 from ThomasWaldmann/more-informative-integrityerror
borg.key: include chunk id in exception msgs
2016-10-10 11:17:03 +02:00
enkore
2e5b2b150b Merge pull request #1709 from ThomasWaldmann/fix-1700
better messages for cache newer than repo, fixes #1700
2016-10-10 11:15:40 +02:00
enkore
76ade6f9fe Merge pull request #1708 from ThomasWaldmann/commit-previous-location
update changed repo location immediately after acceptance
2016-10-10 11:14:40 +02:00
Thomas Waldmann
4fc5a35572 better messages for cache newer than repo, fixes #1700 2016-10-10 06:10:39 +02:00
Thomas Waldmann
f50068944d update changed repo location immediately after acceptance
fixes #1524

before, if a longer backup got interrupted before commit(),
it asked same question again.
2016-10-10 05:18:43 +02:00
Björn Ketelaars
a0df60e1b8 FUSE on OpenBSD
Concerning #1696:

OpenBSD offers in kernel support for FUSE 2.6. Borg relies on llfuse,
which relies on FUSE >2.9.

I'm not aware of plans to bring FUSE on OpenBSD to a more recent
version.

Signed-off-by: Björn Ketelaars <bjorn.ketelaars@hydroxide.nl>
2016-10-10 01:07:30 +02:00
enkore
a69e346126 Merge pull request #1692 from ThomasWaldmann/placeholder-for-integrityerror
IntegrityError: add placeholder for message, fixes #1572
2016-10-07 09:46:33 +02:00
TW
9db16cf897 Merge pull request #1691 from ThomasWaldmann/vagrant-debian7-image-names
vagrant: update image name of boxcutter debian7 boxes
2016-10-06 23:45:32 +02:00
Thomas Waldmann
7434010cdd IntegrityError: add placeholder for message, fixes #1572
So that the message we give appears not only in the traceback, but also in the (short) error message.
2016-10-06 23:36:22 +02:00
Thomas Waldmann
75624f8e05 vagrant: update image name of boxcutter debian7 boxes
debian711* is 404.
2016-10-06 22:58:02 +02:00
Thomas Waldmann
5f337e2c9c borg.key: include chunk id in exception msgs
this is a backport of bcdce91dfb2883c139011322a9e8086059fbe5c2 improvements on the exception msgs.
2016-10-06 22:46:37 +02:00
TW
5ccc124667 Merge pull request #1687 from ThomasWaldmann/backport-bin-to-hex
backport bin_to_hex and use it
2016-10-06 22:21:38 +02:00
Thomas Waldmann
67aafec195 backport bin_to_hex and use it
simplifies code and also porting and merging between 1.0 and 1.1/master.
2016-10-06 05:15:01 +02:00
TW
45a2d8b5c0 Merge pull request #1677 from enkore/pr/1676
Added docs explaining multiple --restrict-to-path flags, with example…
2016-10-06 01:48:13 +02:00
Marian Beermann
573cb616d3 deployment: synthesize alternative --restrict-to-path example 2016-10-06 01:00:07 +02:00
Marian Beermann
4c1a920ed4 debug delete/get obj: fix wrong reference to exception
iow RemoteRepository doesn't define this type, only Repository does.
2016-10-05 12:27:26 +02:00
Simon Heath
cf1c73b4f9 Added docs explaining multiple --restrict-to-path flags, with example (take 2) 2016-10-03 09:25:48 +02:00
enkore
ce72d24825 Clarify FAQ regarding backup of virtual machines (#1672) 2016-10-02 20:11:34 +02:00
enkore
e2fc2a1dfd Merge pull request #1673 from ThomasWaldmann/pyi-use-spec
pyinstaller: use a spec file to build borg.exe binary
2016-10-02 10:44:41 +02:00
Thomas Waldmann
864333d686 pyinstaller: use a spec file to build borg.exe binary
also: exclude osxfuse dylib on Mac OS X
2016-10-02 00:43:45 +02:00
TW
d8a7b17924 Merge pull request #1666 from ThomasWaldmann/improve-borg-debug-docs
add more specific warning about write-access debug commands
2016-09-30 22:44:34 +02:00
TW
8318f5ac0c Merge pull request #1664 from ThomasWaldmann/hashindex-api-version-bumo
Hashindex api version bump
2016-09-30 21:31:05 +02:00
Thomas Waldmann
a65707beb8 add more specific warning about write-access debug commands 2016-09-30 21:09:02 +02:00
Thomas Waldmann
4174291f6f hashindex: bump api version
API_VERSION is used to check whether the compiled binaries are up-to-date.
the tests for the recent iterator fixes of course need updated (fixed) binaries,
so we bump api_version, so not-up-to-date binaries will get identified.
2016-09-30 20:38:46 +02:00
TW
3a3cdadeba Merge pull request #1661 from ThomasWaldmann/update-1.0-changes
update CHANGES
2016-09-29 17:39:21 +02:00