upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-07-16 13:33:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
3110 commits 9 branches 151 tags 71 MiB
Commit graph

3110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Waldmann
529e7831a8 lock development requirements, at least for travis 
to avoid changes in the testing tools causing issues for our oldstable
version, lock stuff to a proven version.
 2018-11-04 17:13:03 +01:00
Thomas Waldmann
dd4727b2f1 avoid pluggy requirement conflict 2018-11-04 17:13:03 +01:00
Thomas Waldmann
0f32c913c8 pytest 3.6.0 raises a RemovedInPytest4Warning breaking pytest-xdist 
... or execnet or something as it can't serialize this exception.

The warning is caused by our usage of a [pytest] section in setup.cfg.
I rather don't want to change this as it might break older pytest
versions.
 2018-11-04 17:13:03 +01:00
Thomas Waldmann
c3396c8ac7 use flake8 < 3.6.0 to avoid new checks for old source 
we won't fix the issues found by recently added style checks in
1.0-maint (they are already fixed in master).
 2018-11-04 17:13:03 +01:00
TW
6f9025c28f
Merge pull request #4099 from ThomasWaldmann/fix-travis 
fix travis-ci breakage on 1.0-maint branch
 2018-10-07 01:26:42 +02:00
Thomas Waldmann
6b37ef24a5 looks like brew update runs into issues, terminating the whole build 2018-10-07 00:56:28 +02:00
Thomas Waldmann
9486a66645 fix tox regression / incompatible change 
tests are broken for tox 3.2.x .. 3.4.0 versions:

/home/travis/build/borgbackup/borg/.tox/py34/bin/python: Error while
  finding spec for 'borg.archiver' (<class 'ImportError'>: No module
  named 'borg')

we see this breakage only on 1.0-maint branch, 1.1-maint is fine.

1.1-maint uses the src/ code layout, 1.0-maint does not. related?
 2018-10-07 00:36:57 +02:00
TW
2f9693f55c
Merge pull request #3967 from russelldavis/mac-docs-1.0 
Update installation instructions for macOS
 2018-07-07 20:02:22 +02:00
Russell Davis
9ca054dc77 Update installation instructions for macOS 
- Updated `OS X` to the new `macOS` name
- Fuse 3.x is no longer just a prerelease
- Added instructions to install fuse via homebrew
 2018-07-07 10:23:22 -07:00
TW
e9321cc561
Merge pull request #3957 from ThomasWaldmann/fix-acl-proto-1.0 
acl platform code: fix acl set return type (1.0-maint)
 2018-07-05 23:15:51 +02:00
Thomas Waldmann
6754634ad7 acl platform code: fix acl set return type (1.0-maint) 2018-07-05 22:52:47 +02:00
TW
65c5ae7e49
Merge pull request #3951 from ThomasWaldmann/fix-xattr-ctypes-1.0 
Fix xattr ctypes (1.0 backport)
 2018-07-05 11:01:16 +02:00
Thomas Waldmann
cb5d2f38c2 xattr: add linux {list,get,set}xattr ctypes prototypes 
(cherry picked from commit 71b02912c9)
 2018-07-03 23:18:14 +02:00
Thomas Waldmann
b4e9397108 xattr: fix darwin flistxattr ctypes prototype 
(cherry picked from commit 2d37c9d3f9)
 2018-07-03 23:18:05 +02:00
TW
b63a57faa6
Merge pull request #3881 from ThomasWaldmann/vagrant-fixes-1.0 
Vagrant fixes (backport to 1.0)
 2018-06-09 22:45:39 +02:00
Thomas Waldmann
9fad66c957 FUSE for macOS: upgrade 3.7.1 to 3.8.0 
(cherry picked from commit c3d2315348)
 2018-06-08 08:54:45 +02:00
Thomas Waldmann
4308632040 Vagrantfile fixes 
remove borgbackup.egg-info dir in fs_init (after rsync)

exclude macOS High Sierra upgrade on the darwin64 machine

(cherry picked from commit 6f3a106b5e)
 2018-06-08 08:54:45 +02:00
TW
564e4e9244
Merge pull request #3835 from ThomasWaldmann/fix-3808-1.0 
xattrs: fix borg exception handling on ENOSPC error, fixes #3808
 2018-05-18 18:52:43 +02:00
TW
965c9e4633
Merge pull request #3834 from ThomasWaldmann/fix-travis-osx-1.0 
travis OS X: use xcode 8.3 (not broken)
 2018-05-18 18:11:36 +02:00
Thomas Waldmann
69778e4c74 xattrs: fix borg exception handling on ENOSPC error, fixes #3808 
(cherry picked from commit 959beb867b)
 2018-05-18 17:24:17 +02:00
Thomas Waldmann
38eb214568 travis OS X: use xcode 8.3 (not broken) 
builds on xcode6.4 are broken since quite a while.
other xcode versions < 8.3 are also broken in the same way.

(cherry picked from commit 2426bb5d20)
 2018-05-18 17:18:44 +02:00
TW
350a928478
Merge pull request #3760 from ThomasWaldmann/rel1012 
Release 1.0.12
 2018-04-08 20:04:02 +02:00
Thomas Waldmann
d2142a673a 1.0.12 release date 2018-04-08 17:42:18 +02:00
Thomas Waldmann
71275af561 python setup.py build_usage 2018-04-08 17:37:18 +02:00
TW
d503e3b860
Merge pull request #3755 from ThomasWaldmann/update-changes-1.0 
update CHANGES (1.0-maint)
 2018-04-08 17:00:52 +02:00
Thomas Waldmann
1de33097ea update CHANGES (1.0-maint) 2018-04-08 16:57:06 +02:00
TW
4b2b861c6a
Merge pull request #3756 from ThomasWaldmann/backports-2 
Backports 2
 2018-04-07 01:30:51 +02:00
Thomas Waldmann
8912fb0e5b backport fs_init (including related updates) from 1.1 2018-04-06 23:30:48 +02:00
Thomas Waldmann
9fda9ff554 vagrant: the boxcutter wheezy boxes are 404, use local ones 
(cherry picked from commit ea03c1dd70)
 2018-04-04 01:16:02 +02:00
Thomas Waldmann
f26dca2022 vagrant: update to Python 3.5.5 (for binary builds) 
(cherry picked from commit 6b44531330)
 2018-04-04 01:12:50 +02:00
Thomas Waldmann
3d73f9849d remove platform.uname() call, fixes #3732 
(cherry picked from commit 4f45eb660a)
 2018-04-04 01:09:43 +02:00
Thomas Waldmann
b55767356c run platform.* calls within a cleaned env, fixes #3732 
also: add exception handler around deprecated platform.linux_distribution() call.
(cherry picked from commit 1e94211bf5)
 2018-04-04 01:08:28 +02:00
TW
4120ea9f5f
Merge pull request #3667 from anowlcalledjosh/docs-formatting-backport-1.0 
Improve formatting of GPG output in documentation (backport to 1.0)
 2018-03-05 17:38:49 +01:00
Josh Holland
6c3d1bb329
Improve formatting of GPG output in documentation 
(cherry picked from commit 9f2f4132ec)
 2018-03-05 15:16:05 +00:00
TW
0e43a6b576
Merge pull request #3659 from dragetd/draget-backport-1.0-doc 
Add docs on how to verify a signed release
 2018-03-03 00:21:51 +01:00
Michael Gajda
ce3d69cc1e Add docs on how to verify a signed release 
Short howto on using gpg to verify a signed binary release.
Fixes #3634
 2018-03-02 22:10:55 +01:00
TW
8fb80421a8
Merge pull request #3657 from miek/backport-3580-to-1.0-maint 
Backport #3580 to 1.0-maint
 2018-03-02 21:18:47 +01:00
Thomas Waldmann
912f96bed8 do .h file content checks in binary mode, fixes #3544 
we can't know the encoding header file authors will use,
so using binary for our simple checks is the safest way.
 2018-03-02 16:28:56 +00:00
TW
d923e9146c
Merge pull request #3648 from miek/backport-3520-to-maint-1.0 
Backport #3520 to 1.0-maint

Chunk seed is generated per /repository/.
 2018-03-01 23:59:22 +01:00
Gregor Kleen
3985263171 Chunk seed is generated per /repository/ 2018-02-28 15:38:56 +00:00
TW
a3f28a6e0e
Merge pull request #3530 from ThomasWaldmann/fix-travis-brew-1.0 
travis osx: run brew update first, fixes #3527 (1.0)
 2018-01-11 11:12:03 +01:00
Thomas Waldmann
91aef59e1c travis osx: run brew update first, fixes #3527 
suggested as work around on the travis issue about this ruby version
issue (wanted: 2.3, having: 2.0).

(cherry picked from commit e4828078bb)
 2018-01-10 19:06:58 +01:00
TW
5b815e8535
Merge pull request #3525 from ThomasWaldmann/fixate-msgpack-requirement-1.0 
require msgpack >= 0.4.6 and < 0.5.0 (1.0-maint).
 2018-01-10 16:02:40 +01:00
Thomas Waldmann
c9f42f06ae require msgpack >= 0.4.6 and < 0.5.0 (1.0-maint). 
maybe this is the easiest way for us to deal with msgpack compatibility.

0.5.0 release had some troubles:
- FutureWarning on stderr disturbing other output there, breaking tests
- pip install -U broken due to a pip issue with the transisition pkg
  which was needed due to the package rename (ImportError for msgpack)
- some linux dists not packaging the transition pkg
- dropped py34 support/testing
 2018-01-10 08:18:39 +01:00
TW
ea3096bf04
Merge pull request #3506 from Abogical/new-year-1.0-maint 
Celebrate the new year with 1.0-maint
 2018-01-03 02:49:45 +01:00
Abogical
d83996c75e Happy new year! 2018-01-02 19:49:11 +02:00
TW
c5b4f55b4c
Merge pull request #3481 from ThomasWaldmann/fix-cpp-macros-1.0 
add parens for C preprocessor macro argument usages (1.0-maint)
 2017-12-23 20:28:33 +01:00
Thomas Waldmann
5d1ef09a5e add parens for C preprocessor macro argument usages 
this is needed for correctness because the preprocessor is just
doing text replacement.

This is the correct way:

#define MUL(x, y) ((x) * (y))

MUL(1+2, 3-4) -> ((1+2) * (3-4))    # not: (1+2 * 3-4)

I didn't put parens around all arg usages for readability.

Some stuff (like index) is not expected to be an expression.

Also, when a arg is only used in another macro or function call,
no parens are needed either.

I reviewed the code: no harm was done (yet) due to this fault.

Thanks to @rciorba who found this.

(cherry picked from commit a3cecf599f)
(cherry picked from commit 981a936f47)
 2017-12-23 18:56:46 +01:00
TW
88b4e1239c
Merge pull request #3418 from ThomasWaldmann/update-changes-1.0 
update CHANGES (1.0-maint)
 2017-12-09 22:25:37 +01:00
Thomas Waldmann
83ad19828b update CHANGES (1.0-maint) 2017-12-09 05:26:10 +01:00