From cb46a14a96ed008cc27b99d73597455dde315de2 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Wed, 4 Apr 2012 11:55:24 -0400
Subject: [PATCH] Setup module tests
---
setup | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/setup b/setup
index a79a8a91258..c5de2e9f221 100755
--- a/setup
+++ b/setup
@@ -46,7 +46,7 @@ md5sum = None
if not os.path.exists(ansible_file):
changed = True
else:
- md5sum = os.popen("md5sum %s" % ansible_file).read()
+ md5sum = os.popen("md5sum %s" % ansible_file).read().split()[0]
# if facter is installed, and we can use --json because
# ruby-json is ALSO installed, include facter data in the JSON
@@ -91,14 +91,15 @@ reformat = json.dumps(new_options, sort_keys=True, indent=4)
f.write(reformat)
f.close()
-md5sum2 = os.popen("md5sum %s" % ansible_file).read()
+md5sum2 = os.popen("md5sum %s" % ansible_file).read().split()[0]
if md5sum != md5sum2:
changed = True
result = {
+ "written" : ansible_file,
"changed" : changed,
- "md5sum" : md5sum
+ "md5sum" : md5sum2
}
print json.dumps(result)