summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-11-07 10:23:32 -0500
committerScott Moser <smoser@ubuntu.com>2012-11-07 10:23:32 -0500
commit8ada8c1f625be5365a5116c458476c7deeae8818 (patch)
treea2f3b4c968a3fd4cbc76ad59ce70563485ea8171 /tools
parent0da58fe113726c7654bca54b365d95044b44ef87 (diff)
parentce5a554672f4ffbc383af08a35d22a1dd89ce41f (diff)
downloadvyos-cloud-init-8ada8c1f625be5365a5116c458476c7deeae8818.tar.gz
vyos-cloud-init-8ada8c1f625be5365a5116c458476c7deeae8818.zip
merge from trunk
Diffstat (limited to 'tools')
-rwxr-xr-xtools/Z99-cloud-locale-test.sh4
-rwxr-xr-xtools/run-pep82
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/Z99-cloud-locale-test.sh b/tools/Z99-cloud-locale-test.sh
index 8ad485e8..4012beeb 100755
--- a/tools/Z99-cloud-locale-test.sh
+++ b/tools/Z99-cloud-locale-test.sh
@@ -22,7 +22,7 @@ locale_warn() {
case "$w1" in
locale:) bad_names="${bad_names} ${w4}";;
*)
- key=${w1%%=*}
+ key=${w1%%\=*}
val=${w1#*=}
val=${val#\"}
val=${val%\"}
@@ -31,7 +31,7 @@ locale_warn() {
done
for bad in $bad_names; do
for var in ${vars}; do
- [ "${bad}" = "${var%=*}" ] || continue
+ [ "${bad}" = "${var%\=*}" ] || continue
value=${var#*=}
[ "${bad_lcs#* ${value}}" = "${bad_lcs}" ] &&
bad_lcs="${bad_lcs} ${value}"
diff --git a/tools/run-pep8 b/tools/run-pep8
index ea46c117..ad55d420 100755
--- a/tools/run-pep8
+++ b/tools/run-pep8
@@ -1,6 +1,6 @@
#!/bin/bash
-ci_files='cloud*.py cloudinit/*.py cloudinit/config/*.py'
+ci_files='cloudinit/*.py cloudinit/config/*.py'
test_files=$(find tests -name "*.py")
def_files="$ci_files $test_files"