diff options
author | 2016-02-10 13:29:46 +0000 | |
---|---|---|
committer | 2016-02-10 16:34:47 +0000 | |
commit | 6f07b795763fcde7716fa12d124c65e553a50c47 (patch) | |
tree | 126642070968c705102fd2b548d65dac3ff08de0 /src/main/java/com/google/devtools | |
parent | ea02b8a51fc924755971f78e392100b50d8dc5a2 (diff) |
Allow load of external label in the WORKSPACE file.
Issue #824 Step 5.
The only thing left to resolve issue #824 are correct handling of
the following cases:
- Forbidding overloading of a repository outside of the first part
of the workspace file (or it will leads to incorrectness issue
and the only use-case is the redefinition of the bazel_tools
repository).
- Better error reporting when trying to refer to a non-existent
repository from the workspace file, for now it will print
a SkyFrame cycle exception.
--
MOS_MIGRATED_REVID=114316464
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java index 0898b3617f..2b1f76c2d4 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java @@ -113,13 +113,6 @@ public class SkylarkImportLookupFunction implements SkyFunction { throws InconsistentFilesystemException, SkylarkImportFailedException, InterruptedException { PathFragment filePath = fileLabel.toPathFragment(); - boolean loadingFromDefaultlRepo = fileLabel.getPackageIdentifier().getRepository().isDefault(); - if (inWorkspace && !loadingFromDefaultlRepo) { - // Loads of files in external repos are currently prohibited in a WORKSPACE file to prevent - // circular skyframe dependencies. - throw SkylarkImportFailedException.noExternalLoadsFromWorkspace(fileLabel); - } - // Load the AST corresponding to this file. ASTFileLookupValue astLookupValue; try { |