1. Rebased with trunk

2. Added example cloud-config
3. Added functioning test for yum config

4 files changed, 11 insertions, 18 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/hacking.py b/tools/hacking.py
index 11163df3..26a07c53 100755
--- a/tools/hacking.py
+++ b/tools/hacking.py
@@ -66,8 +66,8 @@ def cloud_import_alphabetical(physical_line, line_number, lines):
     # handle import x
     # use .lower since capitalization shouldn't dictate order
     split_line = import_normalize(physical_line.strip()).lower().split()
-    split_previous = import_normalize(lines[line_number - 2]
-            ).strip().lower().split()
+    split_previous = import_normalize(lines[line_number - 2])
+    split_previous = split_previous.strip().lower().split()
     # with or without "as y"
     length = [2, 4]
     if (len(split_line) in length and len(split_previous) in length and
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"
 
diff --git a/tools/run-pylint b/tools/run-pylint
index 7ef44ac5..b74efda9 100755
--- a/tools/run-pylint
+++ b/tools/run-pylint
@@ -6,23 +6,16 @@ else
    files=( "$@" );
 fi 
 
+RC_FILE="pylintrc"
+if [ ! -f $RC_FILE ]; then
+    RC_FILE="../pylintrc"
+fi
+
 cmd=(
     pylint
-    --reports=n
-    --include-ids=y
-    --max-line-length=79
-
+    --rcfile=$RC_FILE
     --disable=R
     --disable=I
-
-    --disable=W0142 # Used * or ** magic
-    --disable=W0511 # TODO/FIXME note
-    --disable=W0702 # No exception type(s) specified
-    --disable=W0703 # Catch "Exception"
-
-    --disable=C0103 # Invalid name
-    --disable=C0111 # Missing docstring
-
     "${files[@]}"
 )