riscv
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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".
This commit is contained in:
Jean-Paul Chaput 2021-10-01 00:30:10 +02:00
parent a617cea0a5
commit c28fe3402b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bootstrap/coriolisEnv.py
View File

@ -257,9 +257,12 @@ if __name__ == "__main__":
pyVersion = sys.version_info pyVersion = sys.version_info
version = "%d.%d" % (pyVersion[0],pyVersion[1]) version = "%d.%d" % (pyVersion[0],pyVersion[1])
sitePackagesDir = "sitePackageDir_has_been_not_found" sitePackagesDir = "sitePackageDir_has_been_not_found"
for pyPackageDir in [ "%s/python%s/site-packages" % (absLibDir,version) for pyPackageDir in [ "%s/python%s.%s/site-packages" % (absLibDir,pyVersion[0],pyVersion[1])
, "%s/python%s/dist-packages" % (absLibDir,version) , "%s/python%s.%s/dist-packages" % (absLibDir,pyVersion[0],pyVersion[1])
, "%s/%s/site-packages" % (absLibDir,version) , "%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): if os.path.isdir(pyPackageDir):
sitePackagesDir = pyPackageDir sitePackagesDir = pyPackageDir