From ecb938c95b66ff58840aae64fd5fb791c55ec080 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 18 Jul 2023 13:38:05 -0400
Subject: SL-18837: Try waiting a couple seconds before hdiutil detach
to try to avoid "Resource busy" errors from hdiutil.
---
indra/newview/viewer_manifest.py | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'indra/newview')
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])
--
cgit v1.2.3