A few more PEP8 fixes

This commit is contained in:
Daniel Martí 2014-05-07 16:13:22 +02:00
parent 7a699e4a48
commit 17a4f5c00f
3 changed files with 12 additions and 11 deletions

View file

@ -7,6 +7,7 @@ import time
import hashlib
from optparse import OptionParser
def vagrant(params, cwd=None, printout=False):
"""Run vagrant.
@ -18,7 +19,7 @@ def vagrant(params, cwd=None, printout=False):
is the stdout (and stderr) from vagrant
"""
p = subprocess.Popen(['vagrant'] + params, cwd=cwd,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
out = ''
if printout:
while True:
@ -37,9 +38,9 @@ serverdir = 'buildserver'
parser = OptionParser()
parser.add_option("-v", "--verbose", action="store_true", default=False,
help="Spew out even more information than normal")
help="Spew out even more information than normal")
parser.add_option("-c", "--clean", action="store_true", default=False,
help="Build from scratch, rather than attempting to update the existing server")
help="Build from scratch, rather than attempting to update the existing server")
options, args = parser.parse_args()
config = {}
@ -106,6 +107,7 @@ else:
'606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
wanted = []
def sha256_for_file(path):
with open(path, 'r') as f:
s = hashlib.sha256()
@ -234,4 +236,3 @@ vagrant(['box', 'add', 'buildserver', boxfile, '-f'],
printout=options.verbose)
os.remove(boxfile)