From 7dea17cdc7368d8c005cd80a7402cbd8b5d9136d Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Thu, 13 Jun 2019 18:27:43 -0400 Subject: [PATCH] Fix Xitano's bug by fixing my viewer_manifest bootstrap paradox --- indra/newview/viewer_manifest.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0ca559b29..6c8c8a888 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -723,11 +723,13 @@ class WindowsManifest(ViewerManifest): substitution_strings['installer_file'] = installer_file # Packaging the installer takes forever, dodge it if we can. - binary_mod = os.path.getmtime(os.path.join(self.args['configuration'], self.final_exe())) - installer_mod = os.path.getmtime(os.path.join(self.args['configuration'], installer_file)) - if binary_mod <= installer_mod: - print("Binary is unchanged since last package, touch the binary to trigger repackage.") - exit(); + installer_path = os.path.join(self.args['configuration'], installer_file); + if os.path.isfile(installer_path): + binary_mod = os.path.getmtime(os.path.join(self.args['configuration'], self.final_exe())) + installer_mod = os.path.getmtime(installer_path) + if binary_mod <= installer_mod: + print("Binary is unchanged since last package, touch the binary or delete installer to trigger repackage.") + exit(); version_vars = """ !define INSTEXE "%(final_exe)s"