diff options
author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2018-04-09 16:18:27 +0100 |
---|---|---|
committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2018-07-27 12:24:56 +0000 |
commit | a2e9c62ad25cf5b84f8b06ef082acac7496c0e17 (patch) | |
tree | 3f6588c3b0d299ed8de17765a7168c8774763d5e | |
parent | 8b46e874070911b2923c4750fcc8fa855b034c7f (diff) | |
download | buildstream-a2e9c62ad25cf5b84f8b06ef082acac7496c0e17.tar.gz |
Move _ALIAS_SEPARATOR into utils
The separator is useful in source files other than _project.py
-rw-r--r-- | buildstream/_project.py | 7 | ||||
-rw-r--r-- | buildstream/utils.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py index fee721bbb..fd64f1a7f 100644 --- a/buildstream/_project.py +++ b/buildstream/_project.py @@ -35,9 +35,6 @@ from ._projectrefs import ProjectRefs, ProjectRefStorage from ._versions import BST_FORMAT_VERSION -# The separator we use for user specified aliases -_ALIAS_SEPARATOR = ':' - # Project Configuration file _PROJECT_CONF_FILE = 'project.conf' @@ -135,8 +132,8 @@ class Project(): # fully qualified urls based on the shorthand which is allowed # to be specified in the YAML def translate_url(self, url): - if url and _ALIAS_SEPARATOR in url: - url_alias, url_body = url.split(_ALIAS_SEPARATOR, 1) + if url and utils._ALIAS_SEPARATOR in url: + url_alias, url_body = url.split(utils._ALIAS_SEPARATOR, 1) alias_url = self._aliases.get(url_alias) if alias_url: url = alias_url + url_body diff --git a/buildstream/utils.py b/buildstream/utils.py index e8270d82f..bfb58c9ef 100644 --- a/buildstream/utils.py +++ b/buildstream/utils.py @@ -42,6 +42,10 @@ from . import _signals from ._exceptions import BstError, ErrorDomain +# The separator we use for user specified aliases +_ALIAS_SEPARATOR = ':' + + class UtilError(BstError): """Raised by utility functions when system calls fail. |