Changeset 98031 in vbox

Timestamp:

Jan 9, 2023 1:20:53 PM (23 months ago)

Author:

vboxsync

Message:

ValKit/vboxinstaller.py: Some fixes to r153261 (untested, just like the original). bugref:10284

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py

@@ -85 +85 @@
         self._fKernelDrivers          = True;
         self._fWinForcedInstallTimestampCA = True;
-        self._fInstallMSCRT = False; # By default we don't install any CRT.
+        self._fInstallMsCrt = False; # By default we don't install the Microsoft CRT (only needed once).
 
     #
@@ -147 +147 @@
             self._fWinForcedInstallTimestampCA = True;
         elif asArgs[iArg] == '--no-win-install-mscrt':
-            self._fInstallMSCRT = False;
+            self._fInstallMsCrt = False;
         elif asArgs[iArg] == '--win-install-mscrt':
-            self._fInstallMSCRT = True;
+            self._fInstallMsCrt = True;
         else:
             return TestDriverBase.parseOption(self, asArgs, iArg);
@@ -933 +933 @@
             return None; # There shouldn't be anything to uninstall, and if there is, it's not our fault.
 
-        #
-        # Install the MS Visual Studio Redistributable, if needed.
-        #
-        # Since VBox 7.0 this is a prerequisite, as we don't ship our own redistributable files anymore.
-        #
-        if self._fInstallMSCRT:
-            reporter.log('Installing MS Visual Studio Redistributable ...');
+        # Install the MS Visual Studio Redistributable, if requested. (VBox 7.0+ needs this installed once.)
+        if self._fInstallMsCrt:
+            reporter.log('Installing MS Visual Studio Redistributable (untested code)...');
+            ## @todo Test this.
+            ## @todo We could cache this on the testrsrc share.
             sName = "vc_redist.x64.exe"
-            ## @todo Can we cache this somewhere, so that we don't need to download this everytime?
             sUrl  = "https://aka.ms/vs/17/release/" + sName # Permalink, according to MS.
-            if webutils.downloadFile(sUrl, sName, self.sBuildPath, reporter.log, reporter.log) is not True:
-                sExe   = os.path.join(self.sBuildPath, sName);
+            sExe  = os.path.join(self.sBuildPath, sName);
+            if webutils.downloadFile(sUrl, sExe, None, reporter.log, reporter.log):
                 asArgs = [ sExe, '/Q' ];
                 fRc2, iRc = self._sudoExecuteSync(asArgs);
                 if fRc2 is False:
-                    reporter.error('Installing MS Visual Studio Redistributable failed, exit code: %s' % (iRc,));
-                    return False;
+                    return reporter.error('Installing MS Visual Studio Redistributable failed, exit code: %s' % (iRc,));
                 reporter.log('Installing MS Visual Studio Redistributable done');
+            else:
+                return False;
 
         # We need the help text to detect supported options below.