From a9f3f5a6141ebc305647a9373906a906d20eaaae Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 20 Jan 2006 17:32:43 +0000 Subject: [PATCH] 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 --- wxPython/wxversion/wxversion.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wxPython/wxversion/wxversion.py b/wxPython/wxversion/wxversion.py index 55a95d99ce..cd10d44644 100644 --- 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 @@ -149,6 +149,10 @@ def select(versions, optionsRequired=False): 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 #---------------------------------------------------------------------- @@ -215,6 +219,10 @@ def ensureMinimal(minVersion, optionsRequired=False): 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