hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix mercurial certificate finding, add latest version (#15026)

Browse source
This commit is contained in:
Adam J. Stewart 2020-02-17 17:41:30 -06:00 committed by GitHub
parent 1d7fc47672
commit 9f89dce52f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
var/spack/repos/builtin/packages/mercurial/package.py
View file

@ -11,7 +11,7 @@ class Mercurial(PythonPackage):
"""Mercurial is a free, distributed source control management tool.""" """Mercurial is a free, distributed source control management tool."""
homepage = "https://www.mercurial-scm.org" homepage = "https://www.mercurial-scm.org"
url = "https://www.mercurial-scm.org/release/mercurial-5.1.2.tar.gz" url = "https://www.mercurial-scm.org/release/mercurial-5.3.tar.gz"
import_modules = [ import_modules = [
'hgext', 'hgext3rd', 'mercurial', 'hgext.convert', 'hgext.fsmonitor', 'hgext', 'hgext3rd', 'mercurial', 'hgext.convert', 'hgext.fsmonitor',
@ -20,6 +20,7 @@ class Mercurial(PythonPackage):
'mercurial.httpclient', 'mercurial.pure' 'mercurial.httpclient', 'mercurial.pure'
] ]
version('5.3', sha256='e57ff61d6b67695149dd451922b40aa455ab02e01711806a131a1e95c544f9b9')
version('5.1.2', sha256='15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e') version('5.1.2', sha256='15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e')
version('5.1.1', sha256='35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f') version('5.1.1', sha256='35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f')
version('4.9.1', sha256='1bdd21bb87d1e05fb5cd395d488d0e0cc2f2f90ce0fd248e31a03595da5ccb47') version('4.9.1', sha256='1bdd21bb87d1e05fb5cd395d488d0e0cc2f2f90ce0fd248e31a03595da5ccb47')
@ -61,42 +62,42 @@ def post_install(self):
install('hg-ssh.8', prefix.man.man8) install('hg-ssh.8', prefix.man.man8)
# Install completion scripts # Install completion scripts
contrib = join_path(prefix, 'contrib') contrib = prefix.contrib
mkdir(contrib) mkdir(contrib)
with working_dir('contrib'): with working_dir('contrib'):
install('bash_completion', join_path(contrib, 'bash_completion')) install('bash_completion', contrib.bash_completion)
install('zsh_completion', join_path(contrib, 'zsh_completion')) install('zsh_completion', contrib.zsh_completion)
@run_after('install') @run_after('install')
def configure_certificates(self): def configure_certificates(self):
"""Configuration of HTTPS certificate authorities """Configuration of HTTPS certificate authorities
https://www.mercurial-scm.org/wiki/CACertificates""" https://www.mercurial-scm.org/wiki/CACertificates"""
etc_dir = join_path(self.prefix.etc, 'mercurial') etc_dir = self.prefix.etc.mercurial
mkdirp(etc_dir) mkdirp(etc_dir)
hgrc_filename = join_path(etc_dir, 'hgrc') hgrc_filename = etc_dir.hgrc
# Use certifi to find the location of the CA certificate # Use certifi to find the location of the CA certificate
print_str = self.spec['python'].package.print_string('certifi.where()') print_str = self.spec['python'].package.print_string('certifi.where()')
certificate = python('-c', 'import certifi; ' + print_str) certificate = python('-c', 'import certifi; ' + print_str, output=str)
if not certificate: if not certificate:
tty.warn('CA certificate not found. You may not be able to ' tty.warn('CA certificate not found. You may not be able to '
'connect to an HTTPS server. If your CA certificate ' 'connect to an HTTPS server. If your CA certificate '
'is in a non-standard location, you should add it to ' 'is in a non-standard location, you should add it to '
'{0}.'.format(hgrc_filename)) '{0}.'.format(hgrc_filename))
else:
# Write the global mercurial configuration file # Write the global mercurial configuration file
with open(hgrc_filename, 'w') as hgrc: with open(hgrc_filename, 'w') as hgrc:
hgrc.write('[web]\ncacerts = {0}'.format(certificate)) hgrc.write('[web]\ncacerts = {0}'.format(certificate))
@run_after('install') @run_after('install')
@on_package_attributes(run_tests=True) @on_package_attributes(run_tests=True)
def check_install(self): def check_install(self):
"""Sanity-check setup.""" """Sanity-check setup."""
hg = Executable(join_path(self.prefix.bin, 'hg')) hg = Executable(self.prefix.bin.hg)
hg('debuginstall') hg('debuginstall')
hg('version') hg('version')