You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/01/22 22:00:27 UTC

[13/25] storm git commit: STORM-243: use STORM_LIB_DIR instead of STORM_DIR + "/lib/" and deleted unused variable STORM_RELEASE_DIR

STORM-243:  use STORM_LIB_DIR instead of STORM_DIR + "/lib/" and deleted unused  variable STORM_RELEASE_DIR


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

Branch: refs/heads/master
Commit: 80c84bd681e92f03b67d829d75011420830b36a0
Parents: 09bcdd1
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 10:12:00 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 10:12:00 2015 +0800

----------------------------------------------------------------------
 bin/storm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/80c84bd6/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index 0d8f970..ff3b3dd 100755
--- a/bin/storm
+++ b/bin/storm
@@ -71,7 +71,6 @@ else:
 if (not os.path.isfile(os.path.join(USER_CONF_DIR, "storm.yaml"))):
     USER_CONF_DIR = CLUSTER_CONF_DIR
 
-STORM_RELEASE_DIR = os.path.join(STORM_DIR, "RELEASE")
 STORM_LIB_DIR = os.path.join(STORM_DIR, "lib")
 STORM_BIN_DIR = os.path.join(STORM_DIR, "bin")
 STORM_LOGBACK_FILE_PATH = os.path.join(STORM_DIR, "logback", "cluster.xml")
@@ -88,7 +87,7 @@ def get_config_opts():
     global CONFIG_OPTS
     return "-Dstorm.options=" + ','.join(map(quote_plus,CONFIG_OPTS))
 
-if not os.path.exists(STORM_DIR + "/lib/"):
+if not os.path.exists(STORM_LIB_DIR):
     print("******************************************")
     print("The storm client can only be run from within a release. You appear to be trying to run the client from a checkout of Storm's source code.")
     print("\nYou can download a Storm release at http://storm-project.net/downloads.html")