Commit 147af04d authored by Iustin Pop's avatar Iustin Pop
Browse files

Two small style fixes

This is a merge from the 1.2 branch

Reviewed-by: imsnah
parent d4844f0f
......@@ -1455,7 +1455,7 @@ class HooksRunner(object):
fdstdin = open("/dev/null", "r")
child = subprocess.Popen([script], stdin=fdstdin, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, close_fds=True,
shell=False, cwd="/",env=env)
shell=False, cwd="/", env=env)
output = ""
try:
output = child.stdout.read(4096)
......
......@@ -95,7 +95,7 @@ def ImportInstance(opts, args):
vcpus=opts.vcpus, ip_check=opts.ip_check,
ip=opts.ip, bridge=opts.bridge, start=False,
src_node=opts.src_node, src_path=opts.src_dir,
wait_for_sync=opts.wait_for_sync,mac="auto")
wait_for_sync=opts.wait_for_sync, mac="auto")
SubmitOpCode(op)
return 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment