From fed3462502222aca8896a9164996aa52dcc43812 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sat, 25 Feb 2012 17:16:23 -0500 Subject: [PATCH] applying indentation patch from skvidal --- command | 4 ++-- copy | 8 ++++---- ohai | 4 ++-- ping | 4 ++-- template | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/command b/command index b1a9ce30213..f94ee7f9e33 100755 --- a/command +++ b/command @@ -1,9 +1,9 @@ #!/usr/bin/python try: - import json + import json except ImportError: - import simplejson as json + import simplejson as json import subprocess import sys diff --git a/copy b/copy index 7c94f7260cf..3dfe792c0fe 100644 --- a/copy +++ b/copy @@ -4,9 +4,9 @@ import sys import os try: - import json + import json except ImportError: - import simplejson as json + import simplejson as json source = sys.argv[1] dest = sys.argv[2] @@ -22,14 +22,14 @@ if not os.path.exists(source): md5sum = None changed = False if os.path.exists(dest): - md5sum = os.popen("md5sum %s" % dest).read() + md5sum = os.popen("md5sum %s" % dest).read() os.system("cp %s %s" % (source, dest)) md5sum2 = os.popen("md5sum %s" % dest).read() if md5sum != md5sum2: - changed = True + changed = True # mission accomplished print json.dumps({ diff --git a/ohai b/ohai index 7aefd065015..db3afd5b4b9 100644 --- a/ohai +++ b/ohai @@ -3,9 +3,9 @@ # requires 'ohai' to be installed try: - import json + import json except ImportError: - import simplejson as json + import simplejson as json import subprocess diff --git a/ping b/ping index e40be68a2fe..11a2e65a2c7 100644 --- a/ping +++ b/ping @@ -1,8 +1,8 @@ #!/usr/bin/python try: - import json + import json except ImportError: - import simplejson as json + import simplejson as json print json.dumps(1) diff --git a/template b/template index 5348dd6147b..76f97607b64 100644 --- a/template +++ b/template @@ -4,9 +4,9 @@ import sys import os import jinja2 try: - import json + import json except ImportError: - import simplejson as json + import simplejson as json source = sys.argv[1] dest = sys.argv[2] @@ -45,7 +45,7 @@ source = file(source).read() changed = False md5sum = None if os.path.exists(dest): - md5sum = os.popen("md5sum %s" % dest).read() + md5sum = os.popen("md5sum %s" % dest).read() # call Jinja2 here and save the new template file template = jinja2.Template(source) @@ -61,7 +61,7 @@ f.close() md5sum2 = os.popen("md5sum %s" % dest).read() if md5sum != md5sum2: - changed = True + changed = True # mission accomplished print json.dumps({