mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Code Issues Releases Wiki Activity
2553 commits 9 branches 139 tags 60 MiB
Commit graph

2553 commits

This branch
This branch
All branches
Author SHA1 Message Date
enkore
25ef14e853 Merge pull request #1756 from ThomasWaldmann/fix-freebsd-fuse-tests 
Fix freebsd fuse tests
 2016-10-25 20:56:17 +02:00
TW
d4072bfad0 Merge pull request #1742 from ThomasWaldmann/migrate-previous-location 
avoid previous_location mismatch, fixes #1741
 2016-10-25 19:25:17 +02:00
Thomas Waldmann
baa77c0e04 avoid previous_location mismatch, fixes #1741 
due to the changed canonicalization for relative pathes in PR #1711 (implement /./ relpath hack),
there would be a changed repo location warning and the user would be asked if this is ok.
this would break automation and require manual intervention, which is unwanted.

thus, we automatically fix the previous_location config entry, if it only changed in the
expected way, but still means the same location.
 2016-10-24 19:29:35 +02:00
Thomas Waldmann
02ecf04780 fuse tests: catch ENOTSUP on freebsd 
seems like fuse does not support xattrs there at all.
 2016-10-24 05:19:50 +02:00
Thomas Waldmann
ede3b4a354 fuse: test troublesome xattrs last 2016-10-24 05:19:50 +02:00
Thomas Waldmann
48fa449e39 assert_dirs_equal: add ignore_bsdflags and ignore_xattrs argument 
bsdflags are not supported in the FUSE mount.
xattrs are supported, but are tested separately.
 2016-10-24 05:19:50 +02:00
TW
77110913c7 Merge pull request #1758 from flokli/patch-2 
docs/deployment.rst: do not use bare variables in ansible snippet
 2016-10-24 02:39:16 +02:00
Florian Klink
88f7f8673d docs/deployment.rst: do not use bare variables in ansible snippet 
The current snippet throws deprecation warnings:

```
[DEPRECATION WARNING]: Using bare variables is deprecated. Update your 
playbooks so that the environment value uses the full variable syntax 
('{{auth_users}}').
This feature will be removed in a future 
release. Deprecation warnings can be disabled by setting 
deprecation_warnings=False in ansible.cfg.
```
 2016-10-24 02:34:28 +02:00
TW
f086dad41b Merge pull request #1737 from ThomasWaldmann/vagrant-fix-fuse 
Vagrant fix fuse
 2016-10-22 03:37:46 +02:00
TW
ab8b26b9ac Merge pull request #1752 from ThomasWaldmann/borgversion-enhanced 
implement borgmajor/minor/patch placeholders, fixes #1694
 2016-10-22 00:33:51 +02:00
Thomas Waldmann
22f77b908f implement borgmajor/minor/patch placeholders, fixes #1694 2016-10-22 00:20:50 +02:00
Thomas Waldmann
d49a782796 implement borgmajor/minor/patch placeholders, fixes #1694 2016-10-21 03:43:38 +02:00
Thomas Waldmann
f9aa74e7e1 skip fuse test for borg binary + fakeroot 
strange: works on wheezy, blows up on xenial
 2016-10-20 17:19:37 +02:00
Thomas Waldmann
2b90e45dd1 vagrant: fix fuse permission issues on linux/freebsd, fixes #1544 2016-10-20 16:53:46 +02:00
enkore
bd9f6a6ff9 Merge pull request #1745 from ThomasWaldmann/centos-selinux-ignore 
ignore security.selinux xattrs, fixes #1735
 2016-10-20 13:47:43 +02:00
Thomas Waldmann
ade405eae0 ignore security.selinux xattrs, fixes #1735 
they fail the FUSE tests on centos7.
 2016-10-19 13:37:49 +02:00
TW
1cd48535e4 Merge pull request #1744 from ThomasWaldmann/improve-append-only-docs 
add clarification about append-only mode, fixes #1689
 2016-10-19 02:34:33 +02:00
Thomas Waldmann
c000eb8083 add clarification about append-only mode, fixes #1689 2016-10-19 02:31:39 +02:00
enkore
855e0c953d Merge pull request #1743 from ThomasWaldmann/llfuse-requirement 
add comment about requiring llfuse, fixes #1726
 2016-10-19 01:50:05 +02:00
Thomas Waldmann
f10700841f add comment about requiring llfuse, fixes #1726 2016-10-19 00:56:22 +02:00
TW
ca357a2b38 Merge pull request #1736 from ThomasWaldmann/vagrant-rsync-no-chown 
vagrant: no chown when rsyncing
 2016-10-17 21:02:22 +02:00
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