2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Rule.java b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
index 246ff07550..0a9bd9c82e 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Rule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
@@ -728,6 +728,6 @@ public final class Rule implements Target, DependencyFilter.AttributeInfoProvide
    * @return The repository name.
    */
   public RepositoryName getRepository() {
-    return RepositoryName.createFromValidStrippedName(pkg.getWorkspaceName());
+    return getLabel().getPackageIdentifier().getRepository();
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index 0e5f0e4c1b..abe66c67bb 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -141,6 +141,8 @@ public class WorkspaceFactory {
 
   /**
    * Parses the given WORKSPACE file without resolving skylark imports.
+   *
+   * <p>Called by com.google.devtools.build.workspace.Resolver from //src/tools/generate_workspace.
    */
   public void parse(ParserInputSource source)
       throws BuildFileContainsErrorsException, InterruptedException {