diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-10 13:22:59 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-10 13:22:59 -0400 |
| commit | 7e527b1b2f3fda558fb0f3a6958c42dde4716079 (patch) | |
| tree | e4d78e18b8fbae975ac5d1ec78a67af845b2c650 /cloudinit/config | |
| parent | 0e734b63c64c5534813d7647d33870c9fc3d3a0c (diff) | |
| download | vyos-cloud-init-7e527b1b2f3fda558fb0f3a6958c42dde4716079.tar.gz vyos-cloud-init-7e527b1b2f3fda558fb0f3a6958c42dde4716079.zip | |
minor changes prior to merge
a.) remove 'gpg_' from function names in new gpg module.
b.) use --recv-keys rather than --recv
--recv-keys is more obvious and works back to precise at least.
c.) do not trim trailing '\n' from a armour'd key.
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_apt_configure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index ba080930..96c4a43d 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -22,9 +22,9 @@ import glob import os import re +from cloudinit import gpg from cloudinit import templater from cloudinit import util -from cloudinit import gpg distros = ['ubuntu', 'debian'] @@ -168,7 +168,7 @@ def add_apt_key(ent): keyserver = "keyserver.ubuntu.com" if 'keyserver' in ent: keyserver = ent['keyserver'] - ent['key'] = gpg.gpg_getkeybyid(ent['keyid'], keyserver) + ent['key'] = gpg.get_key_by_id(ent['keyid'], keyserver) if 'key' in ent: add_apt_key_raw(ent['key']) |