mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2484 from enkore/f/json-keynamemismatch 

--json: fix encryption[mode] not being the cmdline name
This commit is contained in:
enkore 2017-05-06 14:38:51 +02:00 committed by GitHub
parent d8b7aef15c c99de523ea
commit 06f63f4d4e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -578,7 +578,6 @@ ext_modules = []
if not on_rtd:
ext_modules += [
Extension('borg.compress', [compress_source], libraries=['lz4'], include_dirs=include_dirs, library_dirs=library_dirs, define_macros=define_macros),
Extension('borg.crypto', [crypto_ll_source], libraries=crypto_libraries, include_dirs=include_dirs, library_dirs=library_dirs, define_macros=define_macros),
Extension('borg.crypto.low_level', [crypto_ll_source], libraries=crypto_libraries, include_dirs=include_dirs, library_dirs=library_dirs, define_macros=define_macros),
Extension('borg.hashindex', [hashindex_source]),
Extension('borg.item', [item_source]),

2
src/borg/helpers.py
View File

@ -1942,7 +1942,7 @@ def basic_json_data(manifest, *, cache=None, extra=None):
data.update({
'repository': BorgJsonEncoder().default(manifest.repository),
'encryption': {
'mode': key.NAME,
'mode': key.ARG_NAME,
},
})
data['repository']['last_modified'] = format_time(to_localtime(manifest.last_timestamp.replace(tzinfo=timezone.utc)))