Avoid overwriting the Oracle home value with None by the method that determines
if a valid Oracle home has been specified.
This commit is contained in:
parent
2938d07b35
commit
d1e5fa3737
8
setup.py
8
setup.py
@ -104,12 +104,12 @@ def CheckOracleHome(directoryToCheck):
|
||||
return False
|
||||
|
||||
# try to determine the Oracle home
|
||||
oracleHome = os.environ.get("ORACLE_HOME")
|
||||
if oracleHome is not None:
|
||||
if not CheckOracleHome(oracleHome):
|
||||
userOracleHome = os.environ.get("ORACLE_HOME")
|
||||
if userOracleHome is not None:
|
||||
if not CheckOracleHome(userOracleHome):
|
||||
messageFormat = "Oracle home (%s) does not refer to an " \
|
||||
"9i, 10g or 11g installation."
|
||||
raise DistutilsSetupError, messageFormat % oracleHome
|
||||
raise DistutilsSetupError, messageFormat % userOracleHome
|
||||
else:
|
||||
for path in os.environ["PATH"].split(os.pathsep):
|
||||
if CheckOracleHome(path):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user