You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/06/03 16:36:37 UTC
ambari git commit: AMBARI-11599 - /usr/bin/ambari-server.py always
returns RC 0
Repository: ambari
Updated Branches:
refs/heads/trunk 8b379e39e -> 692c3a8c4
AMBARI-11599 - /usr/bin/ambari-server.py always returns RC 0
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/692c3a8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/692c3a8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/692c3a8c
Branch: refs/heads/trunk
Commit: 692c3a8c4c260dc8f9705e755efae0b6fe349bba
Parents: 8b379e3
Author: Artem Baranchuk <ab...@hortonworks.con>
Authored: Tue Jun 2 01:10:13 2015 +0300
Committer: Artem Baranchuk <ab...@hortonworks.con>
Committed: Wed Jun 3 17:34:24 2015 +0300
----------------------------------------------------------------------
ambari-server/sbin/ambari-server | 3 ++-
ambari-server/src/main/python/ambari-server.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/692c3a8c/ambari-server/sbin/ambari-server
----------------------------------------------------------------------
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index 7319ed5..1843cd6 100755
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -77,6 +77,7 @@ if (( $numversion < 26 )); then
fi
echo "Using python " $PYTHON
+ret=0
case "$1" in
start)
echo -e "Starting ambari-server"
@@ -151,4 +152,4 @@ case "$1" in
exit 1
esac
-exit 0
+exit $?
http://git-wip-us.apache.org/repos/asf/ambari/blob/692c3a8c/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py
index 749a965..19b7138 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -224,7 +224,7 @@ def setup_security(args):
try:
actionDesc = actions[int(choice) - 1]
except IndexError:
- raise FatalException('Unknown option for setup-security command.')
+ raise FatalException(1, 'Unknown option for setup-security command.')
action = actionDesc[1]
action.execute()