From bb0bf81cb373fde0c59464127633ebc7527f2be5 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Mon, 6 Jun 2016 15:48:25 +0200
Subject: capture output of gpg calls to avoid messing up stdout/stderr

---
 cloudinit/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cloudinit')

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):
-- 
cgit v1.2.3