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 | |
| 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
| -rw-r--r-- | cloudinit/util.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_handler/test_handler_apt_source.py | 3 |
2 files changed, 3 insertions, 2 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): diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py index 9aa6ff71..ea8aa17a 100644 --- a/tests/unittests/test_handler/test_handler_apt_source.py +++ b/tests/unittests/test_handler/test_handler_apt_source.py @@ -469,7 +469,8 @@ class TestAptSourceConfig(TestCase): testsock.close() except socket.error: # as fallback add the known key as a working recv would - util.subp(("gpg", "--import", "-"), EXPECTEDKEY) + util.subp(("gpg", "--import", "-"), EXPECTEDKEY, + capture=True) with mock.patch.object(cc_apt_configure, 'add_apt_key_raw') as mockkey: with mock.patch.object(util, 'gpg_recv_key', |