[release] Fix merge-script startup for using custom workdir

When a custom workdir is used for the checkout, it differs from the workdir
for temporary state files. In this case, code ensuring the existing of the
parent dir wasn't executed.

NOTRY=true

Bug: v8:7735
Change-Id: Idc81b50bb8f880dea45fde08ba4d437c91e96a37
Reviewed-on: https://chromium-review.googlesource.com/1049552
Reviewed-by: Michael Hablich <hablich@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53068}
This commit is contained in:
Michael Achenbach 2018-05-08 11:00:26 +02:00 committed by Commit Bot
parent 61af2762ef
commit 9c718099b6

View File

@ -866,6 +866,11 @@ class ScriptsBase(object):
if not options:
return 1
# Ensure temp dir exists for state files.
state_dir = os.path.dirname(self._config["PERSISTFILE_BASENAME"])
if not os.path.exists(state_dir):
os.makedirs(state_dir)
state_file = "%s-state.json" % self._config["PERSISTFILE_BASENAME"]
if options.step == 0 and os.path.exists(state_file):
os.remove(state_file)