From c28fe3402b6b70c08436dc8e79ffe96ad2eed9b5 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Fri, 1 Oct 2021 00:30:10 +0200
Subject: [PATCH] Take account of more Python site-packages.
* Change: In bootstrap/coriolisEnv.py, the script was looking to
pythonX.Y (like "python2.7" or "python3.6") only. Now added
"major" only directories like "python2" or "python3".
---
bootstrap/coriolisEnv.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py
index 9c5504c7..27ad7c77 100755
--- a/bootstrap/coriolisEnv.py
+++ b/bootstrap/coriolisEnv.py
@@ -257,9 +257,12 @@ if __name__ == "__main__":
pyVersion = sys.version_info
version = "%d.%d" % (pyVersion[0],pyVersion[1])
sitePackagesDir = "sitePackageDir_has_been_not_found"
- for pyPackageDir in [ "%s/python%s/site-packages" % (absLibDir,version)
- , "%s/python%s/dist-packages" % (absLibDir,version)
- , "%s/%s/site-packages" % (absLibDir,version)
+ for pyPackageDir in [ "%s/python%s.%s/site-packages" % (absLibDir,pyVersion[0],pyVersion[1])
+ , "%s/python%s.%s/dist-packages" % (absLibDir,pyVersion[0],pyVersion[1])
+ , "%s/%s.%s/site-packages" % (absLibDir,pyVersion[0],pyVersion[1])
+ , "%s/python%s/site-packages" % (absLibDir,pyVersion[0])
+ , "%s/python%s/dist-packages" % (absLibDir,pyVersion[0])
+ , "%s/%s/site-packages" % (absLibDir,pyVersion[0])
]:
if os.path.isdir(pyPackageDir):
sitePackagesDir = pyPackageDir