Return-Path: X-Original-To: apmail-hawq-commits-archive@minotaur.apache.org Delivered-To: apmail-hawq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DEEAE192BB for ; Wed, 23 Mar 2016 02:56:12 +0000 (UTC) Received: (qmail 75808 invoked by uid 500); 23 Mar 2016 02:56:12 -0000 Delivered-To: apmail-hawq-commits-archive@hawq.apache.org Received: (qmail 75776 invoked by uid 500); 23 Mar 2016 02:56:12 -0000 Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hawq.incubator.apache.org Delivered-To: mailing list commits@hawq.incubator.apache.org Received: (qmail 75761 invoked by uid 99); 23 Mar 2016 02:56:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Mar 2016 02:56:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 2D2E9C0A64 for ; Wed, 23 Mar 2016 02:56:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id psKeUpLGnQwI for ; Wed, 23 Mar 2016 02:56:10 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 3929D5F24A for ; Wed, 23 Mar 2016 02:56:09 +0000 (UTC) Received: (qmail 71013 invoked by uid 99); 23 Mar 2016 02:56:08 -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; Wed, 23 Mar 2016 02:56:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2EE6ADFAB5; Wed, 23 Mar 2016 02:56:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rlei@apache.org To: commits@hawq.incubator.apache.org Message-Id: <570caf7861f3452e830ab057998ffab2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-hawq git commit: HAWQ-567. Fix -U --specia-mode option conflict check Date: Wed, 23 Mar 2016 02:56:08 +0000 (UTC) Repository: incubator-hawq Updated Branches: refs/heads/master 9dedc6ae4 -> 733c94747 HAWQ-567. Fix -U --specia-mode option conflict check Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/733c9474 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/733c9474 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/733c9474 Branch: refs/heads/master Commit: 733c94747793fff14503b261676d4012f1037133 Parents: 9dedc6a Author: rlei Authored: Wed Mar 23 10:49:53 2016 +0800 Committer: rlei Committed: Wed Mar 23 10:55:29 2016 +0800 ---------------------------------------------------------------------- tools/bin/hawq_ctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/733c9474/tools/bin/hawq_ctl ---------------------------------------------------------------------- diff --git a/tools/bin/hawq_ctl b/tools/bin/hawq_ctl index 49a9ff4..aeb871b 100755 --- a/tools/bin/hawq_ctl +++ b/tools/bin/hawq_ctl @@ -943,7 +943,7 @@ def get_args(): logger.error("Multiple actions specified. See the --help info.") sys.exit(1) - if opts.special_mode and (opts.node_type != 'start'): + if opts.special_mode and (opts.hawq_command != 'start'): logger.error("['-U', '--special-mode'] only apply to 'hawq start'. See the --help info.") sys.exit(1)