mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-26 09:47:58 +00:00
Merge branch 'master' into vagrant
This commit is contained in:
commit
39a335f628
1 changed files with 1 additions and 1 deletions
2
setup.py
2
setup.py
|
@ -99,7 +99,7 @@ def detect_lz4(prefixes):
|
||||||
library_dirs.append(os.path.join(ssl_prefix, 'lib'))
|
library_dirs.append(os.path.join(ssl_prefix, 'lib'))
|
||||||
|
|
||||||
|
|
||||||
possible_lz4_prefixes = ['/usr', '/usr/local', '/usr/local/borg', '/opt/local']
|
possible_lz4_prefixes = ['/usr', '/usr/local', '/usr/local/opt/lz4', '/usr/local/lz4', '/usr/local/borg', '/opt/local']
|
||||||
if os.environ.get('BORG_LZ4_PREFIX'):
|
if os.environ.get('BORG_LZ4_PREFIX'):
|
||||||
possible_openssl_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))
|
possible_openssl_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))
|
||||||
lz4_prefix = detect_lz4(possible_lz4_prefixes)
|
lz4_prefix = detect_lz4(possible_lz4_prefixes)
|
||||||
|
|
Loading…
Reference in a new issue