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

resources : added error handling for destination keyword on resource directive

Browse source
This commit is contained in:
Massimiliano Culpo 2015-12-01 15:12:26 +01:00
parent d3d9b5401b
commit b85dccca92
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/spack/spack/directives.py
View file

@ -42,6 +42,7 @@ class OpenMpi(Package):
* ``extends`` * ``extends``
* ``patch`` * ``patch``
* ``variant`` * ``variant``
* ``resource``
""" """
__all__ = ['depends_on', 'extends', 'provides', 'patch', 'version', __all__ = ['depends_on', 'extends', 'provides', 'patch', 'version',
@ -49,9 +50,11 @@ class OpenMpi(Package):
import re import re
import inspect import inspect
import os.path
import functools import functools
from llnl.util.lang import * from llnl.util.lang import *
from llnl.util.filesystem import join_path
import spack import spack
import spack.spec import spack.spec
@ -271,16 +274,27 @@ def resource(pkg, **kwargs):
List of recognized keywords: List of recognized keywords:
* 'when' : represents the condition upon which the resource is needed (optional) * 'when' : represents the condition upon which the resource is needed (optional)
* 'destination' : path where to extract / checkout the resource (optional) * 'destination' : path where to extract / checkout the resource (optional). This path must be a relative path,
and it must fall inside the stage area of the main package.
""" """
when = kwargs.get('when', pkg.name) when = kwargs.get('when', pkg.name)
# FIXME : currently I assume destination to be a relative path (rooted at pkg.stage.source_path)
destination = kwargs.get('destination', "") destination = kwargs.get('destination', "")
# Check if the path is relative
if os.path.isabs(destination):
message = "The destination keyword of a resource directive can't be an absolute path.\n"
message += "\tdestination : '{dest}\n'".format(dest=destination)
raise RuntimeError(message)
# Check if the path falls within the main package stage area
test_path = 'stage_folder_root/'
normalized_destination = os.path.normpath(join_path(test_path, destination)) # Normalized absolute path
if test_path not in normalized_destination:
message = "The destination folder of a resource must fall within the main package stage directory.\n"
message += "\tdestination : '{dest}'\n".format(dest=destination)
raise RuntimeError(message)
when_spec = parse_anonymous_spec(when, pkg.name) when_spec = parse_anonymous_spec(when, pkg.name)
resources = pkg.resources.setdefault(when_spec, []) resources = pkg.resources.setdefault(when_spec, [])
fetcher = from_kwargs(**kwargs) fetcher = from_kwargs(**kwargs)
# FIXME : should we infer the name somehow if not passed ?
name = kwargs.get('name') name = kwargs.get('name')
resources.append(Resource(name, fetcher, destination)) resources.append(Resource(name, fetcher, destination))