You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/10 13:37:40 UTC
[17/22] ambari git commit: AMBARI-20595. There is a syntax error in
install script hence ambari doesn't pick the python 2.7 if system python path
is not present (Aman Poonia via smohanty)
AMBARI-20595. There is a syntax error in install script hence ambari doesn't pick the python 2.7 if system python path is not present (Aman Poonia via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/436c9128
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/436c9128
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/436c9128
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 436c912844657347b5a80f89dedd6d537db82867
Parents: aa78a17
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue May 9 12:05:04 2017 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue May 9 12:06:46 2017 -0700
----------------------------------------------------------------------
ambari-agent/conf/unix/install-helper.sh | 2 +-
ambari-server/conf/unix/install-helper.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/436c9128/ambari-agent/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/install-helper.sh b/ambari-agent/conf/unix/install-helper.sh
index fef634f..c30aab1 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -90,7 +90,7 @@ do_install(){
rm -f "$PYTHON_WRAPER_TARGET"
AMBARI_PYTHON=""
- python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", "/usr/bin/python2.6" )
+ python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7" "/usr/bin/python2.6" )
for python_binary in "${python_binaries[@]}"
do
$python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver >= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null
http://git-wip-us.apache.org/repos/asf/ambari/blob/436c9128/ambari-server/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/install-helper.sh b/ambari-server/conf/unix/install-helper.sh
index 7b29d06..6d7b3c7 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -86,7 +86,7 @@ do_install(){
rm -f "$PYTHON_WRAPER_TARGET"
AMBARI_PYTHON=""
- python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", "/usr/bin/python2.6" )
+ python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7" "/usr/bin/python2.6" )
for python_binary in "${python_binaries[@]}"
do
$python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver >= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null