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 2CD8A19D6F for ; Tue, 29 Mar 2016 16:11:10 +0000 (UTC) Received: (qmail 67785 invoked by uid 500); 29 Mar 2016 16:11:10 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 67753 invoked by uid 500); 29 Mar 2016 16:11:10 -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 67739 invoked by uid 99); 29 Mar 2016 16:11:10 -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; Tue, 29 Mar 2016 16:11:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6777DFF10; Tue, 29 Mar 2016 16:11:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Tue, 29 Mar 2016 16:11:09 -0000 Message-Id: <11163f2f713d404cb198b2c11202deac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-15617 Express Upgrade (after Ambari upgrade) fails due to package import errors for cint (dlysnichenko) Repository: ambari Updated Branches: refs/heads/branch-2.2 34a076bc4 -> c99087729 refs/heads/trunk 6d668d295 -> d60623465 AMBARI-15617 Express Upgrade (after Ambari upgrade) fails due to package import errors for cint (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9908772 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9908772 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9908772 Branch: refs/heads/branch-2.2 Commit: c99087729b55f9e9b8745a37d4d65f4afbaa29a0 Parents: 34a076b Author: Lisnichenko Dmitro Authored: Tue Mar 29 19:07:50 2016 +0300 Committer: Lisnichenko Dmitro Committed: Tue Mar 29 19:10:34 2016 +0300 ---------------------------------------------------------------------- ambari-agent/conf/unix/ambari-agent | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c9908772/ambari-agent/conf/unix/ambari-agent ---------------------------------------------------------------------- diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent index 31e4100..991ce28 100755 --- a/ambari-agent/conf/unix/ambari-agent +++ b/ambari-agent/conf/unix/ambari-agent @@ -47,6 +47,7 @@ OUTFILE=/var/log/ambari-agent/ambari-agent.out LOGFILE=/var/log/ambari-agent/ambari-agent.log AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py AGENT_TMP_DIR=/var/lib/ambari-agent/tmp +AGENT_WORKING_DIR=/var/lib/ambari-agent AMBARI_AGENT_PY_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/AmbariAgent.py OK=1 NOTOK=0 @@ -62,7 +63,7 @@ if [ "$EUID" -ne 0 ] ; then fi # set reliable cwd for this and child processes. -cd $AGENT_TMP_DIR +cd $AGENT_WORKING_DIR keysdir=$(awk -F "=" '/keysdir/ {print $2}' /etc/ambari-agent/conf/ambari-agent.ini) # trim spaces