summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim MacArthur <jim.macarthur@codethink.co.uk>2019-01-09 14:02:39 +0000
committerJim MacArthur <jim.macarthur@codethink.co.uk>2019-01-09 15:01:18 +0000
commitf87d1c93280dd1ac13430dc3c683c77858c20a61 (patch)
tree1ab01ed2665bb1084a9b84a47bedc4f1e42d105b
parentf7681925eee70170ee7c99dc6ade65c625564a73 (diff)
downloadbuildstream-jmac/rename_instance_name.tar.gz
sandboxremote.py: Rename 'instance_name' option to 'instance-name'jmac/rename_instance_name
It was 'instance-name' in the documentation.
-rw-r--r--buildstream/_artifactcache/cascache.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/_artifactcache/cascache.py b/buildstream/_artifactcache/cascache.py
index 9ba748d3a..482d4006f 100644
--- a/buildstream/_artifactcache/cascache.py
+++ b/buildstream/_artifactcache/cascache.py
@@ -53,7 +53,7 @@ class CASRemoteSpec(namedtuple('CASRemoteSpec', 'url push server_cert client_key
#
@staticmethod
def _new_from_config_node(spec_node, basedir=None):
- _yaml.node_validate(spec_node, ['url', 'push', 'server-cert', 'client-key', 'client-cert', 'instance_name'])
+ _yaml.node_validate(spec_node, ['url', 'push', 'server-cert', 'client-key', 'client-cert', 'instance-name'])
url = _yaml.node_get(spec_node, str, 'url')
push = _yaml.node_get(spec_node, bool, 'push', default_value=False)
if not url:
@@ -61,7 +61,7 @@ class CASRemoteSpec(namedtuple('CASRemoteSpec', 'url push server_cert client_key
raise LoadError(LoadErrorReason.INVALID_DATA,
"{}: empty artifact cache URL".format(provenance))
- instance_name = _yaml.node_get(spec_node, str, 'instance_name', default_value=None)
+ instance_name = _yaml.node_get(spec_node, str, 'instance-name', default_value=None)
server_cert = _yaml.node_get(spec_node, str, 'server-cert', default_value=None)
if server_cert and basedir: