From 65082417e4476e2c9cf6e6de98b706397c6a80d9 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 10 Apr 2019 21:17:39 +0200 Subject: [PATCH] Check for msi to exist before trying to delete it. --- builders/windows-builder.py | 7 +------ windows/config-appveyor.ini | 1 - windows/config.ini.default | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 284f97d..122f21f 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -195,7 +195,7 @@ class WindowsBuilder(Builder): """ self._print('Running WiX tools...') msi_file = os.path.join(self.dist_path, 'OpenLP-{}.msi'.format(self.version)) - if msi_file: + if os.path.exists(msi_file): self._print_verbose('Removing old MSI file') os.unlink(msi_file) config_dir = os.path.dirname(self.config_path) @@ -372,11 +372,6 @@ class WindowsBuilder(Builder): copy(os.path.join(self.mutool_exe), os.path.join(self.dist_path, 'mutool.exe')) else: self._print('... WARNING: mutool.exe not found') - self._print_verbose('... MediaInfo.exe') - if self.mediainfo_exe and os.path.isfile(self.mediainfo_exe): - copy(os.path.join(self.mediainfo_exe), os.path.join(self.dist_path, 'MediaInfo.exe')) - else: - self._print('... WARNING: MediaInfo.exe not found') def after_run_sphinx(self): """ diff --git a/windows/config-appveyor.ini b/windows/config-appveyor.ini index 85e4e73..0288d0c 100644 --- a/windows/config-appveyor.ini +++ b/windows/config-appveyor.ini @@ -6,7 +6,6 @@ lrelease = C:\Qt\5.12\msvc2017\bin\lrelease.exe portablelauncher = %(here)s\..\..\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe portableinstaller = %(here)s\..\..\PortableApps.comInstaller\PortableApps.comInstaller.exe mutool = %(here)s\..\..\mupdf-1.14.0-windows\mutool.exe -mediainfo = %(here)s\..\..\MediaInfo\MediaInfo.exe candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe diff --git a/windows/config.ini.default b/windows/config.ini.default index 22a9804..0929567 100644 --- a/windows/config.ini.default +++ b/windows/config.ini.default @@ -6,7 +6,6 @@ lrelease = %(sitepackages)s\PyQt5\bin\lrelease.exe portablelauncher = %(progfiles)s\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe portableinstaller = %(progfiles)s\PortableApps.comInstaller\PortableApps.comInstaller.exe mutool = %(here)s\..\mupdf-1.9a-windows\mutool.exe -mediainfo = %(here)s\..\MediaInfo\MediaInfo.exe candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe