Commit 0133f9fc authored by Ned Deily's avatar Ned Deily Committed by Miss Islington (bot)

macOS installer build: mitigate hdiutil resource busy bug (GH-11333)

parent a936639b
......@@ -1518,16 +1518,27 @@ def buildDMG():
imagepath = imagepath + '.dmg'
os.mkdir(outdir)
# Try to mitigate race condition in certain versions of macOS, e.g. 10.9,
# when hdiutil create fails with "Resource busy". For now, just retry
# the create a few times and hope that it eventually works.
volname='Python %s'%(getFullVersion())
runCommand("hdiutil create -format UDRW -volname %s -srcfolder %s %s"%(
cmd = ("hdiutil create -format UDRW -volname %s -srcfolder %s -size 100m %s"%(
shellQuote(volname),
shellQuote(os.path.join(WORKDIR, 'installer')),
shellQuote(imagepath + ".tmp.dmg" )))
# Try to mitigate race condition in certain versions of macOS, e.g. 10.9,
# when hdiutil fails with "Resource busy"
time.sleep(10)
for i in range(5):
fd = os.popen(cmd, 'r')
data = fd.read()
xit = fd.close()
if not xit:
break
sys.stdout.write(data)
print(" -- retrying hdiutil create")
time.sleep(5)
else:
raise RuntimeError("command failed: %s"%(commandline,))
if not os.path.exists(os.path.join(WORKDIR, "mnt")):
os.mkdir(os.path.join(WORKDIR, "mnt"))
......
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