diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build')
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java index 3c84a073e7..397b01393a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java @@ -139,6 +139,10 @@ public class SkylarkRepositoryFunction extends RepositoryFunction { new IOException(rule + " must create a directory"), Transience.TRANSIENT); } + if (!outputDirectory.getRelative("WORKSPACE").exists()) { + createWorkspaceFile(outputDirectory, rule); + } + return RepositoryDirectoryValue.create(outputDirectory); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryLoaderFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryLoaderFunction.java index 08cd23f7f5..9b40f7c342 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryLoaderFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryLoaderFunction.java @@ -70,7 +70,7 @@ public class RepositoryLoaderFunction implements SkyFunction { env.getListener().handle(Event.warn(Location.fromFile(workspacePath), "Workspace name in " + workspacePath + " (" + workspaceName + ") does not match the " + "name given in the repository's definition (" + nameFromRule + "); this will " - + "cause a build error in future versions.")); + + "cause a build error in future versions")); } return new RepositoryValue(nameFromRule, repository); |