Patch for Bug 1409256, wxversion.py does not understand lib and lib64

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wxversion/wxversion.py b/wxPython/wxversion/wxversion.py
index 55a95d99ceb8dea73829c52a2454a0ed6416c8a9..cd10d44644b331e270ce333a469c140373d59c78 100644 (file)
--- a/wxPython/wxversion/wxversion.py
+++ b/wxPython/wxversion/wxversion.py
@@ -74,7 +74,7 @@ found at: http://wiki.wxpython.org/index.cgi/MultiVersionInstalls
 
 """
 
 
 """
 

-import sys, os, glob, fnmatch
+import re, sys, os, glob, fnmatch

 
 
 _selected = None
 
 
 _selected = None


@@ -149,6 +149,10 @@ def select(versions, optionsRequired=False):
         raise VersionError("Requested version of wxPython not found")
 
     sys.path.insert(0, bestMatch.pathname)
         raise VersionError("Requested version of wxPython not found")
 
     sys.path.insert(0, bestMatch.pathname)

+    # q.v. Bug #1409256
+    path64 = re.sub('/lib/','/lib64/',bestMatch.pathname)
+    if os.path.isdir(path64):
+        sys.path.insert(0, path64)

     _selected = bestMatch
         
 #----------------------------------------------------------------------
     _selected = bestMatch
         
 #----------------------------------------------------------------------


@@ -215,6 +219,10 @@ def ensureMinimal(minVersion, optionsRequired=False):
         sys.exit()
 
     sys.path.insert(0, bestMatch.pathname)
         sys.exit()
 
     sys.path.insert(0, bestMatch.pathname)

+    # q.v. Bug #1409256
+    path64 = re.sub('/lib/','/lib64/',bestMatch.pathname)
+    if os.path.isdir(path64):
+        sys.path.insert(0, path64)

     global _selected
     _selected = bestMatch
         
     global _selected
     _selected = bestMatch