diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java index 25e5bb8f54..42239f6506 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.packages.Package.Builder; import com.google.devtools.build.lib.packages.RuleFactory.BuildLangTypedAttributeValuesMap; -import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.FuncallExpression; import java.util.Map; @@ -35,20 +34,10 @@ public class WorkspaceFactoryHelper { RuleClass ruleClass, RuleClass bindRuleClass, Map<String, Object> kwargs, - FuncallExpression ast, - boolean allowOverride) + FuncallExpression ast) throws RuleFactory.InvalidRuleException, Package.NameConflictException, LabelSyntaxException, - InterruptedException, EvalException { - if (!allowOverride - && kwargs.containsKey("name") - && pkg.targets.containsKey(kwargs.get("name"))) { - throw new EvalException( - ast.getLocation(), - "Cannot redefine repository after any load statement in the WORKSPACE file" - + " (for repository '" - + kwargs.get("name") - + "')"); - } + InterruptedException { + StoredEventHandler eventHandler = new StoredEventHandler(); BuildLangTypedAttributeValuesMap attributeValues = new BuildLangTypedAttributeValuesMap(kwargs); Rule rule = |