upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-15 21:59:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3073 commits 9 branches 151 tags 73 MiB
Commit graph

3073 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
TW
c73c9384e3
Merge pull request #3417 from ThomasWaldmann/backports2 
1.0 Backports 2
 2017-12-09 04:04:38 +01:00
Thomas Waldmann
a8d96f1124 docs: fix examples with problematic option placements, fixes #3356 2017-12-09 03:06:00 +01:00
Thomas Waldmann
8db5d1ba90 docs: document good and problematic option placements, see #3356 2017-12-09 03:06:00 +01:00
Thomas Waldmann
dab45ced20 set bsdflags last (include immutable flag), fixes #3263 
(this was discovered in borg 1.1 for Linux, but applies to OSX/BSD as well)
 2017-12-09 03:06:00 +01:00
TW
4823c54452
Merge pull request #3416 from ThomasWaldmann/backports 
1.0 Backports
 2017-12-09 03:05:19 +01:00
Marian Beermann
f948cfbe35 travis: only short-circuit docs-only changes for pull requests 
if a branch build is stopped, then codecov will complain about
missing base branch coverage.

(cherry picked from commit d2f9e28683)
 2017-12-09 02:05:25 +01:00
Narendra Vardi
e065fccf3d Don't perform full Travis build on docs-only changes #2531 
(cherry picked from commit 944ae4afc3)
 2017-12-09 02:03:05 +01:00
Milkey Mouse
f1164b131b Clarify encrypted key format for borg key export (fixes #3296) 
(cherry picked from commit 68bb3792fb)
 2017-12-09 01:51:29 +01:00
Thomas Waldmann
914d4d461c don't brew update, hopefully fixes #2532 
(cherry picked from commit 6049a07b74)
(cherry picked from commit aac190eae1)
 2017-12-09 00:35:57 +01:00
Thomas Waldmann
8ad1596897 vagrant: use https pypi url for wheezy 
http url stopped working

(cherry picked from commit ce7936b608)
 2017-12-09 00:29:45 +01:00
TW
0bdcf4840c
Merge pull request #3408 from ThomasWaldmann/exclude-broken-pytest330-1.0 
exclude broken pytest 3.3.0 release
 2017-12-02 19:18:20 +01:00
Thomas Waldmann
5353d16012 exclude broken pytest 3.3.0 release 
https://github.com/pytest-dev/pytest/issues/2957
(cherry picked from commit 43184f2dd1)
 2017-12-02 17:47:15 +01:00
TW
52b5f98cbb
Merge pull request #3345 from milkey-mouse/document-sshfs-stupidity-bp1.0 
Document sshfs rename workaround (1.0 backport)
 2017-11-21 00:12:05 +01:00
Milkey Mouse
838ef1b53a
Document sshfs rename workaround (fixes #3315) 2017-11-20 15:01:09 -08:00
TW
ab104d2ce7
Merge pull request #3295 from ThomasWaldmann/release-checklist-1.0 
update release checklist about security fixes
 2017-11-06 10:48:05 +01:00
Thomas Waldmann
4647fa04df update release checklist about security fixes 
(cherry picked from commit 818b61935b)
(cherry picked from commit 07f36542a6)
 2017-11-06 10:44:53 +01:00
TW
1c7b13070b
Merge pull request #3233 from ThomasWaldmann/flake8-fix-1.0 
flake8: add some ignores
 2017-10-29 12:33:39 +01:00
Thomas Waldmann
258767ef7e flake8: add some ignores 
(cherry picked from commit bb1c7a7f57)
 2017-10-29 11:48:54 +01:00
TW
51e0d02571 Merge pull request #3201 from ThomasWaldmann/show-excluded-dirs-1.0 
show excluded dir with "x" for tagged dirs / caches, fixes #3189
 2017-10-21 05:37:55 +02:00
Thomas Waldmann
213d8e2051 show excluded dir with "x" for tagged dirs / caches, fixes #3189 
(cherry picked from commit 75004e9065)
 2017-10-21 00:01:22 +02:00
TW
1209478bbb Merge pull request #3186 from ThomasWaldmann/hardlinked-symlink-warning-1.0 
update docs about hardlinked symlinks limitation
 2017-10-17 22:08:04 +02:00
Thomas Waldmann
936fce91c6 update docs about hardlinked symlinks limitation 
(cherry picked from commit d535c6a25d)
 2017-10-17 22:04:33 +02:00
TW
131c37db59 Merge pull request #3138 from ThomasWaldmann/fix-nonlocal-path-detection-1.0 
fix detection of non-local path, fixes #3108
 2017-10-11 14:00:59 +02:00
TW
78235532bb Merge pull request #3139 from ThomasWaldmann/vagrant-own-fbsd-box-1.0 
vagrant: use self-made FreeBSD 10.3 box, fixes #3022
 2017-10-11 13:59:54 +02:00
Thomas Waldmann
d7bb5783d2 vagrant: use self-made FreeBSD 10.3 box, fixes #3022 
(cherry picked from commit c995797640)
 2017-10-11 04:14:59 +02:00
Thomas Waldmann
a0c576d7b9 fix detection of non-local path, fixes #3108 
filenames like ..foobar are valid, so, to detect stuff in upper dirs,
we need to include the path separator and check if it starts with '../'.

(cherry picked from commit 60e9249100)
 2017-10-11 04:11:47 +02:00
TW
db8c0fe369 Merge pull request #3093 from ThomasWaldmann/faq-eta-1.0 
faq: we do not implement futile attempts of ETA / progress displays
 2017-10-07 02:31:10 +02:00
Thomas Waldmann
750580dbe0 faq: we do not implement futile attempts of ETA / progress displays 
(cherry picked from commit 1e370d4d23)

also backport comment about borg check --repair warning.
 2017-10-06 20:47:35 +02:00
TW
d13fe53c93 Merge pull request #3080 from ThomasWaldmann/fix-subprocess-env-1.0 
fix LDLP restoration for subprocesses, fixes #3077
 2017-10-01 23:08:24 +02:00
Thomas Waldmann
5a5da99b51 fix LDLP restoration for subprocesses, fixes #3077 
(cherry picked from commit b5069770b7)
(cherry picked from commit 7e4d6cac0f)
 2017-10-01 22:25:29 +02:00
TW
f8246ce6bc Merge pull request #3073 from ThomasWaldmann/fix-partial-lines-1.0 
remote: deal with partial lines (1.0-maint backport)
 2017-09-30 03:33:53 +02:00
TW
32d14447f5 Merge pull request #3072 from ThomasWaldmann/fix-spawn-passcommand-1.0 
Fix subprocess environments (1.0-maint)
 2017-09-30 02:42:20 +02:00
Thomas Waldmann
a5bfeddffe remote: deal with partial lines, fixes #2637 
due to block buffering (in borg, pipes, sshd, ssh) partial lines might
be received. for plain text, this causes cosmetic issues.

the code now makes sure handle_remote_line() only gets called with a
complete line (which is terminated by any universal newline char, a
pure \r seems to be needed for remote progress displays).

it also fixes a yet undiscovered partial utf-8-sequence decoding issue
that might occur for the same reason.

(cherry picked from commit f2b48cd5c8)
 2017-09-30 02:41:15 +02:00
Thomas Waldmann
315342edd2 use prepared env for xattr module's fakeroot version check 
(cherry picked from commit 37a5442bef)
 2017-09-30 02:00:24 +02:00
Thomas Waldmann
1ecab600f8 use prepared env for borg umount 
(cherry picked from commit d6f810560c)
 2017-09-30 01:54:12 +02:00
Thomas Waldmann
d5d2d6419f use prepared env for calling BORG_PASSCOMMAND, fixes #3050 
(cherry picked from commit 2f7d7bdbb8)
 2017-09-30 01:47:05 +02:00
TW
05454707d0 Merge pull request #3071 from ThomasWaldmann/exclude-cython027-1.0 
exclude Cython 0.27(.0) in requirements, fixes #3066
 2017-09-30 01:43:02 +02:00