Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream
Commits:
-
718f7aa5
by Phillip Smyth at 2018-09-24T11:06:32Z
2 changed files:
Changes:
| ... | ... | @@ -659,6 +659,8 @@ class Project(): |
| 659 | 659 |
#
|
| 660 | 660 |
def _ensure_project_dir(self, directory):
|
| 661 | 661 |
directory = os.path.abspath(directory)
|
| 662 |
+ print(directory)
|
|
| 663 |
+ print(os.path.isfile(os.path.join(directory, _PROJECT_CONF_FILE)))
|
|
| 662 | 664 |
while not os.path.isfile(os.path.join(directory, _PROJECT_CONF_FILE)):
|
| 663 | 665 |
parent_dir = os.path.dirname(directory)
|
| 664 | 666 |
if directory == parent_dir:
|
| ... | ... | @@ -666,6 +668,8 @@ class Project(): |
| 666 | 668 |
LoadErrorReason.MISSING_PROJECT_CONF,
|
| 667 | 669 |
'{} not found in current directory or any of its parent directories'
|
| 668 | 670 |
.format(_PROJECT_CONF_FILE))
|
| 671 |
+ else:
|
|
| 672 |
+ "HOLY SHIT WTF"
|
|
| 669 | 673 |
directory = parent_dir
|
| 670 | 674 |
|
| 671 | 675 |
return directory
|
| ... | ... | @@ -641,6 +641,9 @@ class Stream(): |
| 641 | 641 |
}
|
| 642 | 642 |
workspaces.append(workspace_detail)
|
| 643 | 643 |
|
| 644 |
+ if not workspaces:
|
|
| 645 |
+ workspaces = "No workspaces found"
|
|
| 646 |
+ |
|
| 644 | 647 |
_yaml.dump({
|
| 645 | 648 |
'workspaces': workspaces
|
| 646 | 649 |
})
|