summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.co.uk>2019-08-08 12:12:59 +0100
committerTristan Maat <tristan.maat@codethink.co.uk>2019-09-06 12:26:17 +0100
commit0b73ddbbbca69c868252576be5b5364f664f550f (patch)
tree647d81a8bf0366ed9d5287874ce217e462cf422f
parent92fedf8b7fffefb76fe9648d99ac684477b3dbd9 (diff)
downloadbuildstream-0b73ddbbbca69c868252576be5b5364f664f550f.tar.gz
_basecache.py: Remove references to 'artifacts'
-rw-r--r--src/buildstream/_basecache.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/buildstream/_basecache.py b/src/buildstream/_basecache.py
index 9ad6c1277..1f306a808 100644
--- a/src/buildstream/_basecache.py
+++ b/src/buildstream/_basecache.py
@@ -86,7 +86,7 @@ class BaseCache():
# Parses the configuration of remote artifact caches from a config block.
#
# Args:
- # config_node (dict): The config block, which may contain the 'artifacts' key
+ # config_node (dict): The config block, which may contain a key defined by cls.config_node_name
# basedir (str): The base directory for relative paths
#
# Returns:
@@ -106,8 +106,8 @@ class BaseCache():
artifacts = config_node.get_sequence(cls.config_node_name, default=[])
except LoadError:
provenance = config_node.get_node(cls.config_node_name).get_provenance()
- raise _yaml.LoadError("{}: 'artifacts' must be a single 'url:' mapping, or a list of mappings"
- .format(provenance), _yaml.LoadErrorReason.INVALID_DATA)
+ raise _yaml.LoadError("{}: '{}' must be a single remote mapping, or a list of mappings"
+ .format(provenance, cls.config_node_name), _yaml.LoadErrorReason.INVALID_DATA)
for spec_node in artifacts:
cache_specs.append(cls.spec_class._new_from_config_node(spec_node, basedir))