summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2018-10-30 16:08:23 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2018-12-11 12:56:32 +0000
commit64836b18c9f72889d94d2fb01fda4ecc80d0816e (patch)
tree5790fb06e47cca376d372b46f5a8df6b4b6f6367
parent67c7a58d0a2c3287cba128ef1f4babc57541439e (diff)
downloadbuildstream-64836b18c9f72889d94d2fb01fda4ecc80d0816e.tar.gz
_project.py: Rename _ensure_project_dir to _find_project_dir
This is a part of #222
-rw-r--r--buildstream/_project.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py
index 386036488..a8962a022 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -96,7 +96,7 @@ class Project():
self.name = None
# The project directory
- self.directory = self._ensure_project_dir(directory)
+ self.directory = self._find_project_dir(directory)
# Absolute path to where elements are loaded from within the project
self.element_path = None
@@ -650,7 +650,7 @@ class Project():
# Source url aliases
output._aliases = _yaml.node_get(config, Mapping, 'aliases', default_value={})
- # _ensure_project_dir()
+ # _find_project_dir()
#
# Returns path of the project directory, if a configuration file is found
# in given directory or any of its parent directories.
@@ -661,7 +661,7 @@ class Project():
# Raises:
# LoadError if project.conf is not found
#
- def _ensure_project_dir(self, directory):
+ def _find_project_dir(self, directory):
directory = os.path.abspath(directory)
while not os.path.isfile(os.path.join(directory, _PROJECT_CONF_FILE)):
parent_dir = os.path.dirname(directory)