getsops/sops
1
0
Fork 0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Code Issues Activity

Fix bad handling of kms/pgp add/rm on creations of new files

Browse Source
This commit is contained in:
Julien Vehent
2015-11-30 09:26:56 -05:00
parent 0e29e56c29
commit 255eed294d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -9,7 +9,7 @@ with codecs.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
setup(
name="sops",
py_modules=['sops'],
version="1.0",
version="1.1",
author="Julien Vehent",
author_email="jvehent@mozilla.com",
description="Secrets OPerationS (sops) is an editor of encrypted files",

5
sops/__init__.py
View File

@@ -38,7 +38,7 @@ else:
if sys.version_info[0] == 3:
raw_input = input
VERSION = 1.0
VERSION = 1.1
DESC = """
`sops` supports AWS KMS and PGP encryption:
@@ -190,8 +190,7 @@ def main():
kms_arns=kms_arns,
pgp_fps=pgp_fps)
if not existing_file:
if len(args.add_kms) > 0 or len(args.add_pgp) > 0 \
or len(args.rm_kms) > 0 or len(args.rm_pgp) > 0:
if args.add_kms or args.add_pgp or args.rm_kms or args.rm_pgp:
panic("cannot add or remove keys on non-existent files, use "
"`--kms` and `--pgp` instead.", error_code=49)
# encrypt and decrypt modes are not available on non-existent files