storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/2] storm git commit: Merge branch 'STORM-2597' of https://github.com/revans2/incubator-storm into STORM-2597
Date Thu, 29 Jun 2017 18:25:16 GMT
Repository: storm
Updated Branches:
  refs/heads/1.x-branch 9f89f7788 -> 60e19ccb1


Merge branch 'STORM-2597' of https://github.com/revans2/incubator-storm into STORM-2597

STORM-2597: Don't parse passed in class paths


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

Branch: refs/heads/1.x-branch
Commit: 14980968c4424cc57aa2af627b3b0c4afca0e734
Parents: 9f89f77
Author: Robert Evans <evans@yahoo-inc.com>
Authored: Thu Jun 29 13:19:58 2017 -0500
Committer: Robert Evans <evans@yahoo-inc.com>
Committed: Thu Jun 29 13:20:59 2017 -0500

----------------------------------------------------------------------
 bin/storm.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/14980968/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index a51baba..9109118 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -143,11 +143,9 @@ def get_classpath(extrajars, daemon=True):
     if daemon:
         ret.extend(get_wildcard_dir(STORM_DIR + "/extlib-daemon"))
     if STORM_EXT_CLASSPATH != None:
-        for path in STORM_EXT_CLASSPATH.split(os.pathsep):
-            ret.extend(get_wildcard_dir(path))
+        ret.append(STORM_EXT_CLASSPATH)
     if daemon and STORM_EXT_CLASSPATH_DAEMON != None:
-        for path in STORM_EXT_CLASSPATH_DAEMON.split(os.pathsep):
-            ret.extend(get_wildcard_dir(path))
+        ret.append(STORM_EXT_CLASSPATH_DAEMON)
     ret.extend(extrajars)
     return normclasspath(os.pathsep.join(ret))
 


Mime
View raw message