Commit 17cad9d4 authored by Matthias Putz's avatar Matthias Putz

added wait() to external link creation calls + fixed new byte stream issue

parent b61a606d
......@@ -57,12 +57,12 @@ def os_link(src, dst):
cmd = 'cmd /c mklink /D "%s" "%s"' % (dst, src)
if IsTrace():
Trace(cmd)
subprocess.Popen(cmd, stdout=subprocess.PIPE)
subprocess.Popen(cmd, stdout=subprocess.PIPE).wait()
else:
cmd = 'cmd /c mklink "%s" "%s"' % (dst, src)
if IsTrace():
Trace(cmd)
subprocess.Popen(cmd, stdout=subprocess.PIPE)
subprocess.Popen(cmd, stdout=subprocess.PIPE).wait()
def removeReadOnlyFilesHandler(fn, path, excinfo):
removeReadOnlyFiles(fn, path)
......
......@@ -240,7 +240,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
else x
for x in script ]
script = Editor.EditString("\n".join(script)).split("\n")
script = portable.stream2str(Editor.EditString("\n".join(script))).split("\n")
project_re = re.compile(r'^#?\s*project\s*([^\s]+)/:$')
branch_re = re.compile(r'^\s*branch\s*([^\s(]+)\s*\(.*')
......
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