You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2013/12/18 20:27:49 UTC
[1/2] git commit: AMBARI-4113. Bootstrap fails without a meaningful
message (Dmytro Shkvyra via dlysnichenko)
Updated Branches:
refs/heads/branch-1.4.3 eb14b87c1 -> 70d590a1d
refs/heads/trunk 2cba1853d -> 942eb8002
AMBARI-4113. Bootstrap fails without a meaningful message (Dmytro Shkvyra via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/942eb800
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/942eb800
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/942eb800
Branch: refs/heads/trunk
Commit: 942eb80027d25df844e5ce0cbd6692d5ed5d8544
Parents: 2cba185
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Dec 18 21:21:07 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Dec 18 21:21:07 2013 +0200
----------------------------------------------------------------------
ambari-server/src/main/python/setupAgent.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/942eb800/ambari-server/src/main/python/setupAgent.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/setupAgent.py b/ambari-server/src/main/python/setupAgent.py
index be62d8d..9a4eaa9 100755
--- a/ambari-server/src/main/python/setupAgent.py
+++ b/ambari-server/src/main/python/setupAgent.py
@@ -128,12 +128,12 @@ def isAgentPackageAlreadyInstalled(projectVersion):
def getAvaliableAgentPackageVersions():
yumCommand = ["bash", "-c",
- """yum list all ambari-agent | grep -E '^ambari-agent' | sed -re 's/\s+/ /g' | cut -d ' ' -f 2 | tr '\\n' ', ' """]
+ """yum list all ambari-agent | grep -E '^ambari-agent' | sed -re 's/\s+/ /g' | cut -d ' ' -f 2 | tr '\\n' ', ' | sed -e 's/-\w[^:]*//1' """]
return execOsCommand(yumCommand)
def getAvaliableAgentPackageVersionsSuse():
yumCommand = ["bash", "-c",
- """zypper search -s --match-exact ambari-agent | grep -E '^ambari-agent' | sed -re 's/\s+/ /g' | cut -d '|' -f 4 | tr '\\n' ', ' """]
+ """zypper search -s --match-exact ambari-agent | grep ambari-agent | sed -re 's/\s+/ /g' | cut -d '|' -f 4 | tr '\\n' ', ' | sed -e 's/-\w[^:]*//1' """]
return execOsCommand(yumCommand)
def checkServerReachability(host, port):
[2/2] git commit: AMBARI-4113. Bootstrap fails without a meaningful
message (Dmytro Shkvyra via dlysnichenko)
Posted by dm...@apache.org.
AMBARI-4113. Bootstrap fails without a meaningful message (Dmytro Shkvyra via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70d590a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70d590a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70d590a1
Branch: refs/heads/branch-1.4.3
Commit: 70d590a1dfcb8df093dcb36aad506cced9c305f8
Parents: eb14b87
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Dec 18 21:22:13 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Dec 18 21:22:13 2013 +0200
----------------------------------------------------------------------
ambari-server/src/main/python/setupAgent.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/70d590a1/ambari-server/src/main/python/setupAgent.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/setupAgent.py b/ambari-server/src/main/python/setupAgent.py
index be62d8d..9a4eaa9 100755
--- a/ambari-server/src/main/python/setupAgent.py
+++ b/ambari-server/src/main/python/setupAgent.py
@@ -128,12 +128,12 @@ def isAgentPackageAlreadyInstalled(projectVersion):
def getAvaliableAgentPackageVersions():
yumCommand = ["bash", "-c",
- """yum list all ambari-agent | grep -E '^ambari-agent' | sed -re 's/\s+/ /g' | cut -d ' ' -f 2 | tr '\\n' ', ' """]
+ """yum list all ambari-agent | grep -E '^ambari-agent' | sed -re 's/\s+/ /g' | cut -d ' ' -f 2 | tr '\\n' ', ' | sed -e 's/-\w[^:]*//1' """]
return execOsCommand(yumCommand)
def getAvaliableAgentPackageVersionsSuse():
yumCommand = ["bash", "-c",
- """zypper search -s --match-exact ambari-agent | grep -E '^ambari-agent' | sed -re 's/\s+/ /g' | cut -d '|' -f 4 | tr '\\n' ', ' """]
+ """zypper search -s --match-exact ambari-agent | grep ambari-agent | sed -re 's/\s+/ /g' | cut -d '|' -f 4 | tr '\\n' ', ' | sed -e 's/-\w[^:]*//1' """]
return execOsCommand(yumCommand)
def checkServerReachability(host, port):