Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FD1017DD1 for ; Fri, 10 Apr 2015 11:24:09 +0000 (UTC) Received: (qmail 52189 invoked by uid 500); 10 Apr 2015 11:23:53 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 52158 invoked by uid 500); 10 Apr 2015 11:23:53 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 52149 invoked by uid 99); 10 Apr 2015 11:23:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 11:23:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4ADBCDFF0B; Fri, 10 Apr 2015 11:23:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vbrodetskyi@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-10431. Do not do anything when ambari-server setup executed ONLY with -s.(vbrodetskyi) Date: Fri, 10 Apr 2015 11:23:53 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk f126bec03 -> ff2f00614 AMBARI-10431. Do not do anything when ambari-server setup executed ONLY with -s.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ff2f0061 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ff2f0061 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ff2f0061 Branch: refs/heads/trunk Commit: ff2f00614ba1389d450aba8ba5d96e778fdad735 Parents: f126bec Author: Vitaly Brodetskyi Authored: Thu Apr 9 02:11:59 2015 +0300 Committer: Vitaly Brodetskyi Committed: Thu Apr 9 02:11:59 2015 +0300 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 10 ++++++++++ .../src/main/python/ambari_server/serverSetup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ff2f0061/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 0824268..70c4232 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -591,6 +591,16 @@ def mainBody(): init_parser_options(parser) (options, args) = parser.parse_args() + # check if only silent key set + default_options = parser.get_default_values() + silent_options = default_options + silent_options.silent = True + + if options == silent_options: + options.only_silent = True + else: + options.only_silent = False + # set verbose set_verbose(options.verbose) if options.verbose: http://git-wip-us.apache.org/repos/asf/ambari/blob/ff2f0061/ambari-server/src/main/python/ambari_server/serverSetup.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py index 4f700ed..d1e9a35 100644 --- a/ambari-server/src/main/python/ambari_server/serverSetup.py +++ b/ambari-server/src/main/python/ambari_server/serverSetup.py @@ -946,7 +946,7 @@ def check_setup_already_done(): # Setup the Ambari Server. # def setup(options): - if get_silent(): + if options.only_silent: if check_setup_already_done(): print "Nothing was done. Please, use ambari-server setup command without [-s] key, to change configuration." sys.exit(0)