Changeset 103326 in vbox

Timestamp:

Feb 13, 2024 12:53:57 AM (10 months ago)

Author:

vboxsync

Message:

Installer/vboxapisetup.py: Use os.path.exist() rather than searching the listdir() output when searching for a module. listdir may barf on 2.6 if applied to .zip files (not that it is necessarily relevant). bugref:10579

File:

• trunk/src/VBox/Installer/common/vboxapisetup.py (modified) (2 diffs)

trunk/src/VBox/Installer/common/vboxapisetup.py

@@ -151 +151 @@
     return True
 
+## @todo r=bird: This is supposed to be publicly visible?
 def findModulePathHelper(sModule = 'vboxapi', asDirs = None):
     """
@@ -161 +162 @@
     for sPath in asDirs:
         if g_fVerbose:
-            print('Searching for "%s" in path "%s" ...' % (sModule, sPath))
-        ## @todo r=bird: WOW. We read the directory and then look for a filename in the returned list?!? Case sensitively.
-        ##  What about:
-        ## if g_fVerbose: # drop this
-        ##     print(os.listdir(sPath));
-        ## sCandiate = os.path.join(sPath, sModule);
-        ## if os.path.exists(sCandiate):
-        ##     return sCandiate;
-        if os.path.isdir(sPath):
-            asDirEntries = os.listdir(sPath)
-            if g_fVerbose:
-                print(asDirEntries)
-            if sModule in asDirEntries:
-                return os.path.join(sPath, sModule)
+            print('Searching for "%s" in "%s" ...' % (sModule, sPath))
+            try: print(os.listdir(sPath));
+            except: pass;
+        sCandiate = os.path.join(sPath, sModule);
+        if os.path.exists(sCandiate):
+             return sCandiate;
     return None
 
+## @todo r=bird: This is supposed to be publicly visible?
 def findModulePath(sModule = 'vboxapi'):
     """