cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2006-01-20 17:32:43 +00:00
parent 1631143c6f
commit a9f3f5a614
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wxPython/wxversion/wxversion.py
View File

@ -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") raise VersionError("Requested version of wxPython not found")
sys.path.insert(0, bestMatch.pathname) 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.exit()
sys.path.insert(0, bestMatch.pathname) 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 global _selected
_selected = bestMatch _selected = bestMatch