summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-12-02 20:20:41 -0500
committerScott Moser <smoser@brickies.net>2016-12-02 20:20:41 -0500
commit166df605dc9864eb163007300db7a611feb309d6 (patch)
tree7b87cd0b092f731c610cc59c3f18fa8b7c200ed5 /doc
parentf6d5dc486776019e0799f95f8d1982be8fba4da5 (diff)
downloadvyos-cloud-init-166df605dc9864eb163007300db7a611feb309d6.tar.gz
vyos-cloud-init-166df605dc9864eb163007300db7a611feb309d6.zip
fix decoding of utf-8 chars in yaml test
Python 3 would fail to load yaml from doc/examples/cloud-config-apt.txt when the LANG (specifically LC_CTYPE) was 'C'. The changes here do 2 things: a.) remove the non-ascii characters from the yaml file. b.) fix the validate-yaml.py program to decode using utf-8 specifically rather than using the inherited settings. This fixes it now for ascii and in the future also should non-ascii slip in.
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/cloud-config-apt.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/examples/cloud-config-apt.txt b/doc/examples/cloud-config-apt.txt
index 1a0fc6f2..ff8206f6 100644
--- a/doc/examples/cloud-config-apt.txt
+++ b/doc/examples/cloud-config-apt.txt
@@ -70,7 +70,7 @@ apt:
# modifications have been made.
# Suites are even disabled if no other modification was made,
# but not if is preserve_sources_list is active.
- # There is a special alias “$RELEASE” as in the sources that will be replace
+ # There is a special alias "$RELEASE" as in the sources that will be replace
# by the matching release.
#
# To ease configuration and improve readability the following common ubuntu
@@ -84,7 +84,7 @@ apt:
# There is no harm in specifying a suite to be disabled that is not found in
# the source.list file (just a no-op then)
#
- # Note: Lines don’t get deleted, but disabled by being converted to a comment.
+ # Note: Lines don't get deleted, but disabled by being converted to a comment.
# The following example disables all usual defaults except $RELEASE-security.
# On top it disables a custom suite called "mysuite"
disable_suites: [$RELEASE-updates, backports, $RELEASE, mysuite]