Skip to content

Commit

Permalink
Revert "Revert "Refs #5172 - Temp fix for linux64 warnings.""
Browse files Browse the repository at this point in the history
This reverts commit 2ab1252, putting back
in place the removal of code that imports the .so files.
  • Loading branch information
PeterParker committed May 2, 2012
1 parent 8af7622 commit 7d39053
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions Code/Mantid/scripts/Inelastic/IndirectBayes.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
import QLdata_win32 as QLd, QLse_win32 as Qse
import Quest_win32 as Que, ResNorm_win32 as resnorm
import CEfit_win32 as cefit, SSfit_win32 as ssfit
elif ( operatingenvironment == 'Linux64bit' ):
import erange_lnx64 as Er, QLres_lnx64 as QLr
import QLdata_lnx64 as QLd, QLse_lnx64 as Qse
import Quest_lnx64 as Que, ResNorm_lnx64 as resnorm
import CEfit_lnx64 as cefit, SSfit_lnx64 as ssfit
else:
sys.exit('F2Py Bayes programs NOT available on ' + operatingenvironment)

Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/scripts/Inelastic/IndirectCommon.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def inF2PyCompatibleEnv():
'''Returns true if we are in an environment where our Fortran2Python
files are usable, otherwise returns false.'''
osEnv = platform.system() + platform.architecture()[0]
if osEnv == 'Windows32bit' or osEnv == 'Linux64bit':
if osEnv == 'Windows32bit':
return True
return False

Expand Down

0 comments on commit 7d39053

Please sign in to comment.