spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: Limit help option regex
Date Fri, 01 May 2015 18:27:16 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.3 f64b99421 -> d7269493d


Limit help option regex

Added word-boundary delimiters so that embedded text such as "-h" within command line options
and values doesn't trigger the usage script and exit.

Author: Chris Biow <chris.biow@10gen.com>

Closes #5816 from cbiow/patch-1 and squashes the following commits:

36b3726 [Chris Biow] Limit help option regex

(cherry picked from commit c8c481da18688e684d4e34f14c5afa0b5d37a618)
Signed-off-by: Sean Owen <sowen@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d7269493
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d7269493
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d7269493

Branch: refs/heads/branch-1.3
Commit: d7269493d8724a59738ac4164496c35c8acd82d3
Parents: f64b994
Author: Chris Biow <chris.biow@10gen.com>
Authored: Fri May 1 19:26:55 2015 +0100
Committer: Sean Owen <sowen@cloudera.com>
Committed: Fri May 1 19:27:12 2015 +0100

----------------------------------------------------------------------
 bin/spark-shell2.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/d7269493/bin/spark-shell2.cmd
----------------------------------------------------------------------
diff --git a/bin/spark-shell2.cmd b/bin/spark-shell2.cmd
index 1d1a40d..16ca875 100644
--- a/bin/spark-shell2.cmd
+++ b/bin/spark-shell2.cmd
@@ -19,7 +19,7 @@ rem
 
 set SPARK_HOME=%~dp0..
 
-echo "%*" | findstr " --help -h" >nul
+echo "%*" | findstr " \<--help\> \<-h\>" >nul
 if %ERRORLEVEL% equ 0 (
   call :usage
   exit /b 0


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message