Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.

Commit 0c69a6a

Browse files
giusepperh-atomic-bot
authored andcommitted
trust, sign: prevent gpg warnings to be printed
I've noticed this warning while using "atomic trust show": gpg: WARNING: no command supplied. Trying to guess what you mean ... Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1126 Approved by: rhatdan
1 parent 840732d commit 0c69a6a

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

Atomic/sign.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,17 @@ def no_reg_no_default_error(image, registry_path):
134134
"overwrite it, please delete this file first")
135135

136136
util.skopeo_standalone_sign(expanded_image_name, manifest_file.name,
137-
self.get_fingerprint(signer), fq_sig_path, debug=self.args.debug)
137+
self.get_fingerprint(signer, self.args.debug), fq_sig_path, debug=self.args.debug)
138138
util.write_out("Created: {}".format(fq_sig_path))
139139

140140
finally:
141141
os.remove(manifest_file.name)
142142

143143
@staticmethod
144-
def get_fingerprint(signer):
144+
def get_fingerprint(signer, debug):
145145
cmd = ['gpg2', '--no-permission-warning', '--with-colons', '--fingerprint', signer]
146-
stdout = util.check_output(cmd)
146+
stderr = None if debug else util.DEVNULL
147+
stdout = util.check_output(cmd, stderr=stderr)
147148
for line in stdout.splitlines():
148149
_line = line.decode('utf-8')
149150
if _line.startswith('fpr:'):

Atomic/trust.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ def get_pubkey_data(self, key_reference):
227227
if not token.scheme or not token.netloc:
228228
if not os.path.exists(key_reference):
229229
cmd = ["gpg2", "--armor", "--export", key_reference]
230-
keydata = util.check_output(cmd)
230+
stderr = None if self.args.debug else util.DEVNULL
231+
keydata = util.check_output(cmd, stderr=stderr)
231232
if not keydata:
232233
raise ValueError("The public key reference '%s' was not "
233234
"found as a file or in the user's GPG "
@@ -502,7 +503,8 @@ def get_gpg_id(self, keys):
502503
key = tmpkey.name
503504
cmd = ["gpg2", "--with-colons", key]
504505
try:
505-
results = util.check_output(cmd).decode('utf-8')
506+
stderr = None if self.args.debug else util.DEVNULL
507+
results = util.check_output(cmd, stderr=stderr).decode('utf-8')
506508
except util.FileNotFound:
507509
results = ""
508510
if tmpkey:

0 commit comments

Comments
 (0)