applying indentation patch from skvidal

reviewable/pr18780/r1
Michael DeHaan 13 years ago
parent 62dee290c5
commit fed3462502

@ -1,9 +1,9 @@
#!/usr/bin/python #!/usr/bin/python
try: try:
import json import json
except ImportError: except ImportError:
import simplejson as json import simplejson as json
import subprocess import subprocess
import sys import sys

@ -4,9 +4,9 @@ import sys
import os import os
try: try:
import json import json
except ImportError: except ImportError:
import simplejson as json import simplejson as json
source = sys.argv[1] source = sys.argv[1]
dest = sys.argv[2] dest = sys.argv[2]
@ -22,14 +22,14 @@ if not os.path.exists(source):
md5sum = None md5sum = None
changed = False changed = False
if os.path.exists(dest): 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)) os.system("cp %s %s" % (source, dest))
md5sum2 = os.popen("md5sum %s" % dest).read() md5sum2 = os.popen("md5sum %s" % dest).read()
if md5sum != md5sum2: if md5sum != md5sum2:
changed = True changed = True
# mission accomplished # mission accomplished
print json.dumps({ print json.dumps({

@ -3,9 +3,9 @@
# requires 'ohai' to be installed # requires 'ohai' to be installed
try: try:
import json import json
except ImportError: except ImportError:
import simplejson as json import simplejson as json
import subprocess import subprocess

@ -1,8 +1,8 @@
#!/usr/bin/python #!/usr/bin/python
try: try:
import json import json
except ImportError: except ImportError:
import simplejson as json import simplejson as json
print json.dumps(1) print json.dumps(1)

@ -4,9 +4,9 @@ import sys
import os import os
import jinja2 import jinja2
try: try:
import json import json
except ImportError: except ImportError:
import simplejson as json import simplejson as json
source = sys.argv[1] source = sys.argv[1]
dest = sys.argv[2] dest = sys.argv[2]
@ -45,7 +45,7 @@ source = file(source).read()
changed = False changed = False
md5sum = None md5sum = None
if os.path.exists(dest): 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 # call Jinja2 here and save the new template file
template = jinja2.Template(source) template = jinja2.Template(source)
@ -61,7 +61,7 @@ f.close()
md5sum2 = os.popen("md5sum %s" % dest).read() md5sum2 = os.popen("md5sum %s" % dest).read()
if md5sum != md5sum2: if md5sum != md5sum2:
changed = True changed = True
# mission accomplished # mission accomplished
print json.dumps({ print json.dumps({

Loading…
Cancel
Save