Skip to content

[archive] Print stderr if the gpg command fails #4032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arif-ali merged 1 commit into from
May 30, 2025
Merged

[archive] Print stderr if the gpg command fails #4032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions sos/archive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ def _encrypt(self, archive):
enc_cmd += "-c --passphrase-fd 0 "
enc_cmd = f"/bin/bash -c \"echo $sos_gpg | {enc_cmd}\""
enc_cmd += archive
r = sos_get_command_output(enc_cmd, timeout=0, env=env)
r = sos_get_command_output(enc_cmd, timeout=0, env=env, stderr=True)
if r["status"] == 0:
return arc_name
if r["status"] == 2:
Expand All @@ -662,9 +662,7 @@ def _encrypt(self, archive):
else:
msg = "Could not read passphrase"
else:
# TODO: report the actual error from gpg. Currently, we cannot as
# sos_get_command_output() does not capture stderr
msg = f"gpg exited with code {r['status']}"
msg = f"gpg exited with code {r['status']} and error {r['output']}"
raise Exception(msg)

def _build_archive(self, method): # pylint: disable=unused-argument
Expand Down
Loading