diff options
author | Jean-Paul Calderone <exarkun@divmod.com> | 2009-11-11 10:36:04 -0500 |
---|---|---|
committer | Jean-Paul Calderone <exarkun@divmod.com> | 2009-11-11 10:36:04 -0500 |
commit | 6ef65885373259bedbd79354f829f78eddb241ce (patch) | |
tree | 5851c615ad91feaa026ab35a3a0c7f9dfc7519b6 /setup.py | |
parent | bcd4545f70a2439c6f5d54938b057cf00734e8ab (diff) | |
download | pyopenssl-git-6ef65885373259bedbd79354f829f78eddb241ce.tar.gz |
Try to ignore things like C:\Program Files\Subversion
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -76,20 +76,24 @@ if os.name == 'nt' or sys.platform == 'win32': """ Find OpenSSL's install directory. """ + potentials = [] dirs = os.environ.get("PATH").split(os.pathsep) for d in dirs: if os.path.exists(os.path.join(d, "openssl.exe")): ssldir, bin = os.path.split(d) if not bin: ssldir, bin = os.path.split(ssldir) + potentials.append(ssldir) childdirs = os.listdir(ssldir) - if (not os.path.isdir(os.path.join(ssldir, "lib")) or - not os.path.isdir(os.path.join(ssldir, "include"))): - msg = "'%s' is not a proper OpenSSL install dir" - raise DistutilsFileError(msg % ssldir) - self.with_openssl = ssldir - return - raise DistutilsFileError("could not find 'openssl.exe'") + if "lib" in childdirs and "include" in childdirs: + self.with_openssl = ssldir + return + if potentials: + raise DistutilsFileError( + "Only found improper OpenSSL directories: %r" % ( + potentials,)) + else: + raise DistutilsFileError("Could not find 'openssl.exe'") def find_openssl_dlls(self): |