From e64bfcee6ded1abba01b5e356d7507035c8c8261 Mon Sep 17 00:00:00 2001 From: Michajlo Matijkiw Date: Mon, 18 Jul 2016 14:37:08 +0000 Subject: Don't store workspace name on rule Instead have callers get it via package. -- MOS_MIGRATED_REVID=127715494 --- .../java/com/google/devtools/build/lib/rules/python/PyCommon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java index ae43116519..2c334431e8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java @@ -57,7 +57,6 @@ import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.protobuf.GeneratedMessage.GeneratedExtension; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -436,7 +435,8 @@ public final class PyCommon { return null; } - PathFragment workspaceName = new PathFragment(ruleContext.getRule().getWorkspaceName()); + PathFragment workspaceName = new PathFragment( + ruleContext.getRule().getPackage().getWorkspaceName()); return workspaceName.getRelative(mainArtifact.getRunfilesPath()).getPathString(); } -- cgit v1.2.3