Changeset 104883 in vbox

Timestamp:

Jun 11, 2024 9:40:58 AM (10 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163485

Message:

ValKit/vboxinstaller.py: Fixed leagcy ext pack handling in _installExtPack. bugref:10690

File:

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

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

@@ -1203 +1203 @@
         return None;
 
+    ksExtPackBasenames = [ 'Oracle_VirtualBox_Extension_Pack', 'Oracle_VM_VirtualBox_Extension_Pack', ];
     def _installExtPack(self):
         """ Installs the extension pack. """
@@ -1213 +1214 @@
             return False;
 
-        sExtPack = self._findFile('Oracle_VirtualBox_Extension_Pack.vbox-extpack');
-        if sExtPack is None:
-            sExtPack = self._findFile('Oracle_VirtualBox_Extension_Pack.*.vbox-extpack');
-        # legacy name check:
-        if sExtPack is None:
-            sExtPack = self._findFile('Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack');
+        for sExtPackBasename in self.ksExtPackBasenames:
+            sExtPack = self._findFile('%s.vbox-extpack' % (sExtPackBasename,));
+            if sExtPack is None:
+                sExtPack = self._findFile('%s.*.vbox-extpack' % (sExtPackBasename,));
             if sExtPack is not None:
-                fLegacyName = True;
-        if sExtPack is None:
-            sExtPack = self._findFile('Oracle_VM_VirtualBox_Extension_Pack.*.vbox-extpack');
-            if sExtPack is not None:
-                fLegacyName = True;
+                break;
         if sExtPack is None:
             return True;
 
-        if not fLegacyName:
-            sDstDir = os.path.join(sExtPackDir, 'Oracle_VirtualBox_Extension_Pack');
-        else:
-            sDstDir = os.path.join(sExtPackDir, 'Oracle_VM_VirtualBox_Extension_Pack');
+        sDstDir = os.path.join(sExtPackDir, sExtPackBasename);
         reporter.log('Installing extension pack "%s" to "%s"...' % (sExtPack, sExtPackDir));
         fRc, _ = self._sudoExecuteSync([ self.getBinTool('vts_tar'),