Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Atomic/sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,17 @@ def no_reg_no_default_error(image, registry_path):
"overwrite it, please delete this file first")

util.skopeo_standalone_sign(expanded_image_name, manifest_file.name,
self.get_fingerprint(signer), fq_sig_path, debug=self.args.debug)
self.get_fingerprint(signer, self.args.debug), fq_sig_path, debug=self.args.debug)
util.write_out("Created: {}".format(fq_sig_path))

finally:
os.remove(manifest_file.name)

@staticmethod
def get_fingerprint(signer):
def get_fingerprint(signer, debug):
cmd = ['gpg2', '--no-permission-warning', '--with-colons', '--fingerprint', signer]
stdout = util.check_output(cmd)
stderr = None if debug else util.DEVNULL
stdout = util.check_output(cmd, stderr=stderr)
for line in stdout.splitlines():
_line = line.decode('utf-8')
if _line.startswith('fpr:'):
Expand Down
6 changes: 4 additions & 2 deletions Atomic/trust.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ def get_pubkey_data(self, key_reference):
if not token.scheme or not token.netloc:
if not os.path.exists(key_reference):
cmd = ["gpg2", "--armor", "--export", key_reference]
keydata = util.check_output(cmd)
stderr = None if self.args.debug else util.DEVNULL
keydata = util.check_output(cmd, stderr=stderr)
if not keydata:
raise ValueError("The public key reference '%s' was not "
"found as a file or in the user's GPG "
Expand Down Expand Up @@ -502,7 +503,8 @@ def get_gpg_id(self, keys):
key = tmpkey.name
cmd = ["gpg2", "--with-colons", key]
try:
results = util.check_output(cmd).decode('utf-8')
stderr = None if self.args.debug else util.DEVNULL
results = util.check_output(cmd, stderr=stderr).decode('utf-8')
except util.FileNotFound:
results = ""
if tmpkey:
Expand Down