Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream
Commits:
-
2618cb91
by Phillip Smyth at 2018-09-24T12:24:03Z
2 changed files:
Changes:
| ... | ... | @@ -659,13 +659,20 @@ class Project(): |
| 659 | 659 |
#
|
| 660 | 660 |
def _ensure_project_dir(self, directory):
|
| 661 | 661 |
directory = os.path.abspath(directory)
|
| 662 |
+ print("project dir: {}".format(directory))
|
|
| 663 |
+ print("Projet Conf File: {}".format(_PROJECT_CONF_FILE))
|
|
| 664 |
+ print("project conf file exists: {}".format(os.path.isfile(os.path.join(directory, _PROJECT_CONF_FILE))))
|
|
| 662 | 665 |
while not os.path.isfile(os.path.join(directory, _PROJECT_CONF_FILE)):
|
| 663 | 666 |
parent_dir = os.path.dirname(directory)
|
| 667 |
+ print("Parent Dir: {}".format(parent_dir))
|
|
| 668 |
+ print("directory == parent_dir: {}".format(directory == parent_dir))
|
|
| 664 | 669 |
if directory == parent_dir:
|
| 665 | 670 |
raise LoadError(
|
| 666 | 671 |
LoadErrorReason.MISSING_PROJECT_CONF,
|
| 667 | 672 |
'{} not found in current directory or any of its parent directories'
|
| 668 | 673 |
.format(_PROJECT_CONF_FILE))
|
| 674 |
+ else:
|
|
| 675 |
+ print("HOLY SHIT WTF")
|
|
| 669 | 676 |
directory = parent_dir
|
| 670 | 677 |
|
| 671 | 678 |
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 |
})
|