summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-07-18 13:38:05 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-07-18 13:38:05 -0400
commitecb938c95b66ff58840aae64fd5fb791c55ec080 (patch)
treeffbd31d4da623f25237074392a9dd90f4dfa9a89 /indra/newview
parentdcb1403661f227b16fd5d5622c7e1a692b461c5b (diff)
SL-18837: Try waiting a couple seconds before hdiutil detach
to try to avoid "Resource busy" errors from hdiutil.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4660991de6..1e43485b9c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1329,6 +1329,10 @@ class DarwinManifest(ViewerManifest):
self.run_command([self.src_path_of("installers/darwin/apple-notarize.sh"), app_in_dmg])
finally:
+ # Empirically, on GitHub we've hit errors like:
+ # hdiutil: couldn't eject "disk10" - Resource busy
+ # Try waiting a bit to see if that improves reliability.
+ time.sleep(2)
# Unmount the image even if exceptions from any of the above
self.run_command(['hdiutil', 'detach', '-force', devfile])