Changeset 2091 for branches/casa-prerelease/pre-asap/python/env.py
- Timestamp:
- 04/01/11 16:20:19 (14 years ago)
- Location:
- branches/casa-prerelease/pre-asap
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/casa-prerelease/pre-asap
-
branches/casa-prerelease/pre-asap/python
- Property svn:mergeinfo changed
/trunk/python merged: 2090
- Property svn:mergeinfo changed
-
branches/casa-prerelease/pre-asap/python/env.py
r1859 r2091 75 75 return ' unknown ' 76 76 casapath=os.environ["CASAPATH"].split() 77 if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/2.5/asap'): 77 versioninfo = sys.version_info 78 pyversion = '%s.%s'%(versioninfo[0],versioninfo[1]) 79 if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/%s/asap'%(pyversion)): 78 80 # for casa developer environment (linux or darwin) 79 revinfo=casapath[0]+'/'+casapath[1]+'/python/ 2.5/asap/svninfo.txt'81 revinfo=casapath[0]+'/'+casapath[1]+'/python/%s/asap/svninfo.txt'%(pyversion) 80 82 else: 81 83 # for end-user environments … … 83 85 revinfo=casapath[0]+'/Resources/python/asap/svninfo.txt' 84 86 else: 85 revinfo=casapath[0]+'/lib/python 2.5/asap/svninfo.txt'87 revinfo=casapath[0]+'/lib/python%s/asap/svninfo.txt'%(pyversion) 86 88 if os.path.isfile(revinfo): 87 89 f = file(revinfo)
Note:
See TracChangeset
for help on using the changeset viewer.