summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-09-13 15:10:22 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-09-13 15:10:22 -0400
commitbaa0faa7d126e07b05d3f57d56a5440beb1c20b7 (patch)
treec8e6ce02b185540cf7d44199c43faec826279a64 /indra
parentb1c93e6a50cb98de154bf6cabd0d7734248c1423 (diff)
SL-19242: Don't die if Windows app image installers/windows exists.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/viewer_manifest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 527aa25d05..40e6a8fa7c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -810,7 +810,8 @@ class WindowsManifest(ViewerManifest):
# don't want them installed with the viewer - they're only for use by
# the installer itself.
shutil.copytree(os.path.join(self.get_src_prefix(), 'installers', 'windows'),
- os.path.join(self.get_dst_prefix(), 'installers', 'windows'))
+ os.path.join(self.get_dst_prefix(), 'installers', 'windows'),
+ dirs_exist_ok=True)
tempfile = "secondlife_setup_tmp.nsi"
# the following replaces strings in the nsi template