aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google
diff options
context:
space:
mode:
authorGravatar Laurent Le Brun <laurentlb@google.com>2015-09-18 10:43:49 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-09-21 08:56:46 +0000
commit99081ce80d6021320028955b406f5000d15e84ae (patch)
treeaf6f3e8f58ae88f29951c3d04a5d789bbcc094b3 /src/main/java/com/google
parentae90bc9098e187ce118624bef49ec7107b378f59 (diff)
Native.glob: Remove obsolete 'excludes' argument.
Due to a typo in the past, we had to support both 'exclude' and 'excludes' for the migration. -- MOS_MIGRATED_REVID=103371676
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
index 02752f552c..ab823940ef 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
@@ -52,22 +52,16 @@ public class SkylarkNativeModule {
optionalPositionals = {
@Param(name = "exclude", type = SkylarkList.class, generic1 = String.class,
defaultValue = "[]", doc = "The list of glob patterns to exclude."),
- @Param(name = "excludes", type = SkylarkList.class, generic1 = String.class,
- defaultValue = "[]", doc = "The list of glob patterns to exclude."),
// TODO(bazel-team): accept booleans as well as integers? (and eventually migrate?)
@Param(name = "exclude_directories", type = Integer.class, defaultValue = "1",
doc = "A flag whether to exclude directories or not.")},
useAst = true, useEnvironment = true)
private static final BuiltinFunction glob = new BuiltinFunction("glob") {
public GlobList<String> invoke(
- SkylarkList include, SkylarkList exclude, SkylarkList excludes,
+ SkylarkList include, SkylarkList exclude,
Integer excludeDirectories, FuncallExpression ast, Environment env)
throws EvalException, ConversionException, InterruptedException {
env.checkLoadingPhase("native.glob", ast.getLocation());
- // TODO(bazel-team): Remove 'excludes' argument in July 2015.
- if (exclude.size() == 0) {
- exclude = excludes;
- }
return PackageFactory.callGlob(
null, false, include, exclude, excludeDirectories != 0, ast, env);
}