zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "openssl : solved glitch to prevent spack to freeze when the network is unreachable"

Browse Source 
This reverts commit 4cf4bf3a03.
This commit is contained in:
alalazo 2016-03-18 14:42:24 +01:00
parent ec8cc2b528
commit 5f6f2d5f51
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
var/spack/repos/builtin/packages/openssl/package.py
View File

@ -1,4 +1,4 @@
import urllib2
import urllib
import llnl.util.tty as tty
from spack import *
@ -37,22 +37,17 @@ def url_for_version(self, version):
version_number = '.'.join([str(x) for x in version[:-1]])
older_url = older.format(version_number=version_number, version_full=version)
latest_url = latest.format(version=version)
try:
response = urllib2.urlopen(latest.format(version=version), timeout=5)
if response.getcode() == 404:
openssl_url = older_url
# Checks if we already warned the user for this particular version of OpenSSL.
# If not we display a warning message and mark this version
if not warnings_given_to_user.get(version, False):
tty.warn('This installation depends on an old version of OpenSSL, which may have known security issues. ')
tty.warn('Consider updating to the latest version of this package.')
tty.warn('More details at {homepage}'.format(homepage=Openssl.homepage))
warnings_given_to_user[version] = True
else:
openssl_url = latest_url
except urllib2.URLError:
tty.warn('Cannot connect to network to retrieve OpenSSL version. Using default url.')
warnings_given_to_user[version] = True
response = urllib.urlopen(latest.format(version=version))
if response.getcode() == 404:
openssl_url = older_url
# Checks if we already warned the user for this particular version of OpenSSL.
# If not we display a warning message and mark this version
if not warnings_given_to_user.get(version, False):
tty.warn('This installation depends on an old version of OpenSSL, which may have known security issues. ')
tty.warn('Consider updating to the latest version of this package.')
tty.warn('More details at {homepage}'.format(homepage=Openssl.homepage))
warnings_given_to_user[version] = True
else:
openssl_url = latest_url
# Store the computed URL
openssl_urls[version] = openssl_url