aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2016-04-01 15:17:37 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-04-01 18:24:57 +0000
commitfdcb1244c63b40dae2c1a0bdd37271e8bf92109a (patch)
treeb80ea9006fc75a73d7622df6974dcbfae5252888 /src
parent494e311493c2f90ce0cc2020957245da9415fc0a (diff)
Make local_repository's interpretation of 'path' match the other rules'
Noticed this while messing with remote runfiles. RELNOTES: local_repository can take a relative path. -- MOS_MIGRATED_REVID=118780775
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java
index 130e163996..258cb960a0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryFunction.java
@@ -16,10 +16,8 @@ package com.google.devtools.build.lib.rules.repository;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.RuleDefinition;
-import com.google.devtools.build.lib.packages.AggregatingAttributeMapper;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.skyframe.FileValue;
-import com.google.devtools.build.lib.syntax.Type;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.skyframe.SkyFunction.Environment;
@@ -33,6 +31,7 @@ import java.io.IOException;
* Access a repository on the local filesystem.
*/
public class LocalRepositoryFunction extends RepositoryFunction {
+
@Override
public boolean isLocal(Rule rule) {
return true;
@@ -41,9 +40,8 @@ public class LocalRepositoryFunction extends RepositoryFunction {
@Override
public SkyValue fetch(
Rule rule, Path outputDirectory, BlazeDirectories directories, Environment env)
- throws SkyFunctionException {
- AggregatingAttributeMapper mapper = AggregatingAttributeMapper.of(rule);
- PathFragment pathFragment = new PathFragment(mapper.get("path", Type.STRING));
+ throws SkyFunctionException {
+ PathFragment pathFragment = RepositoryFunction.getTargetPath(rule, directories.getWorkspace());
try {
outputDirectory.createSymbolicLink(pathFragment);
} catch (IOException e) {