Changeset 104879 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 10, 2024 4:11:54 PM (10 months ago)

Author:

vboxsync

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

163480

Message:

ValidationKit: bugref:10690: A try to fix regression added in r163460; Support for legacy ExtPack name.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (1 diff)

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

@@ -1216 +1216 @@
         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');
+            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;
         if sExtPack is None:
             return True;
 
-        sDstDir = os.path.join(sExtPackDir, 'Oracle_VirtualBox_Extension_Pack');
+        if not fLegacyName:
+            sDstDir = os.path.join(sExtPackDir, 'Oracle_VirtualBox_Extension_Pack');
+        else:
+            sDstDir = os.path.join(sExtPackDir, 'Oracle_VM_VirtualBox_Extension_Pack');
         reporter.log('Installing extension pack "%s" to "%s"...' % (sExtPack, sExtPackDir));
         fRc, _ = self._sudoExecuteSync([ self.getBinTool('vts_tar'),