diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-15 12:06:58 -0500 |
| commit | eb29af61f9388de7a69bf7112193976dd4feb6db (patch) | |
| tree | 0a12d1de1bc6bb5527a3f99d01401df95250c0c7 /cloudinit/config/cc_ca_certs.py | |
| parent | 4613bb45dde05cc859a0b4dec6587d80767b47c7 (diff) | |
| parent | 584b8434872322a9f617831742cc6b15977ecfbc (diff) | |
| download | vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.tar.gz vyos-cloud-init-eb29af61f9388de7a69bf7112193976dd4feb6db.zip | |
merge from master at 0.7.8-45-g584b843
Diffstat (limited to 'cloudinit/config/cc_ca_certs.py')
| -rw-r--r-- | cloudinit/config/cc_ca_certs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_ca_certs.py b/cloudinit/config/cc_ca_certs.py index 53d14060..df77ba62 100644 --- a/cloudinit/config/cc_ca_certs.py +++ b/cloudinit/config/cc_ca_certs.py @@ -32,7 +32,7 @@ can be removed from the system with the configuration option **Module frequency:** per instance -**Supporte distros:** ubuntu, debian +**Supported distros:** ubuntu, debian **Config keys**:: @@ -82,8 +82,8 @@ def add_ca_certs(certs): # We have to strip the content because blank lines in the file # causes subsequent entries to be ignored. (LP: #1077020) orig = util.load_file(CA_CERT_CONFIG) - cur_cont = '\n'.join([l for l in orig.splitlines() - if l != CA_CERT_FILENAME]) + cur_cont = '\n'.join([line for line in orig.splitlines() + if line != CA_CERT_FILENAME]) out = "%s\n%s\n" % (cur_cont.rstrip(), CA_CERT_FILENAME) util.write_file(CA_CERT_CONFIG, out, omode="wb") |