diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-11-16 17:33:49 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-11-22 15:03:55 +0000 |
| commit | bf8fc373d7711861129ab841a74ecf32b3d8b2dd (patch) | |
| tree | dd1b8c94a73b61f34ffcfbb8942cbb763a7bf210 /buildstream/_project.py | |
| parent | 43d3871533a41524f3537793a2a1ea1a7a3e1aed (diff) | |
| download | buildstream-bf8fc373d7711861129ab841a74ecf32b3d8b2dd.tar.gz | |
Replace 'push-url' and 'pull-url' options with just 'url'sam/canonical-push-urls
This is possible now that the SSH protocol can redirect to the
appropriate pull URL.
Note that this commit makes no attempt at backwards compatibility.
Everthing will break!
Diffstat (limited to 'buildstream/_project.py')
| -rw-r--r-- | buildstream/_project.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py index 8348ca9f1..3a4bf97f3 100644 --- a/buildstream/_project.py +++ b/buildstream/_project.py @@ -171,9 +171,8 @@ class Project(): # Load artifacts pull/push configuration for this project artifacts = _yaml.node_get(config, Mapping, 'artifacts', default_value={}) - _yaml.node_validate(artifacts, ['pull-url', 'push-url']) - self.artifact_pull = _yaml.node_get(artifacts, str, 'pull-url', default_value='') or None - self.artifact_push = _yaml.node_get(artifacts, str, 'push-url', default_value='') or None + _yaml.node_validate(artifacts, ['url']) + self.artifact_url = _yaml.node_get(artifacts, str, 'url', default_value='') or None # Workspace configurations self._workspaces = self._load_workspace_config() |