Return-Path: X-Original-To: apmail-flume-commits-archive@www.apache.org Delivered-To: apmail-flume-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 5583ADBE6 for ; Thu, 20 Dec 2012 17:51:32 +0000 (UTC) Received: (qmail 31570 invoked by uid 500); 20 Dec 2012 17:51:32 -0000 Delivered-To: apmail-flume-commits-archive@flume.apache.org Received: (qmail 31534 invoked by uid 500); 20 Dec 2012 17:51:32 -0000 Mailing-List: contact commits-help@flume.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flume.apache.org Delivered-To: mailing list commits@flume.apache.org Received: (qmail 31516 invoked by uid 99); 20 Dec 2012 17:51:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2012 17:51:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CCC1E324C76; Thu, 20 Dec 2012 17:51:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brock@apache.org To: commits@flume.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Cleanup uneeded code Message-Id: <20121220175131.CCC1E324C76@tyr.zones.apache.org> Date: Thu, 20 Dec 2012 17:51:31 +0000 (UTC) Updated Branches: refs/heads/FLUME-1787 4c953da20 -> 5ccd59fe3 Cleanup uneeded code Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/5ccd59fe Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/5ccd59fe Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/5ccd59fe Branch: refs/heads/FLUME-1787 Commit: 5ccd59fe3aa292f5c01625cf445c337a0721db0f Parents: 4b7fd0e Author: Brock Noland Authored: Thu Dec 20 11:51:20 2012 -0600 Committer: Brock Noland Committed: Thu Dec 20 11:51:20 2012 -0600 ---------------------------------------------------------------------- dev-support/test-patch.py | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/5ccd59fe/dev-support/test-patch.py ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.py b/dev-support/test-patch.py index 2c253fa..4583a63 100755 --- a/dev-support/test-patch.py +++ b/dev-support/test-patch.py @@ -128,18 +128,12 @@ def git_apply(result, cmd, patch_file, strip, output_dir): result.fatal("failed to apply patch (exit code %d):\n%s\n" % (rc, output)) def mvn_clean(result, output_dir): - if output_dir: - rc = execute("mvn clean 1>%s/clean.out 2>&1" % output_dir) - else: - rc = execute("mvn clean") + rc = execute("mvn clean 1>%s/clean.out 2>&1" % output_dir) if rc != 0: - result.fatal("failed to clean project (exit code %d" % (rc)) + result.fatal("failed to clean project (exit code %d)" % (rc)) def mvn_install(result, output_dir): - if output_dir: - rc = execute("mvn install -DskipTests 1>%s/install.out 2>&1" % output_dir) - else: - rc = execute("mvn install -DskipTests") + rc = execute("mvn install -DskipTests 1>%s/install.out 2>&1" % output_dir) if rc != 0: result.fatal("failed to build with patch (exit code %d)" % (rc)) @@ -149,10 +143,7 @@ def find_all_files(top): yield os.path.join(root, f) def mvn_test(result, output_dir): - if output_dir: - rc = execute("mvn test 1>%s/test.out 2>&1" % output_dir) - else: - rc = execute("mvn test") + rc = execute("mvn test 1>%s/test.out 2>&1" % output_dir) if rc == 0: result.success("all tests passed") else: