diff options
author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-06 15:48:25 +0200 |
---|---|---|
committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-06 15:48:25 +0200 |
commit | bb0bf81cb373fde0c59464127633ebc7527f2be5 (patch) | |
tree | fd3ffabb1403986bc6f9c1b986112d892f013a19 /cloudinit | |
parent | 71ea8d200da164df6f5e28d28aea424b57fd8f1f (diff) | |
download | vyos-cloud-init-bb0bf81cb373fde0c59464127633ebc7527f2be5.tar.gz vyos-cloud-init-bb0bf81cb373fde0c59464127633ebc7527f2be5.zip |
capture output of gpg calls to avoid messing up stdout/stderr
Diffstat (limited to 'cloudinit')
-rw-r--r-- | cloudinit/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index d3b14f72..6d16532d 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2254,7 +2254,7 @@ def gpg_recv_key(key, keyserver): def gpg_delete_key(key): """Delete the specified key from the local gpg ring""" - subp(["gpg", "--batch", "--yes", "--delete-keys", key], capture=False) + subp(["gpg", "--batch", "--yes", "--delete-keys", key], capture=True) def getkeybyid(keyid, keyserver): |