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 2014/11/18 18:54:22 UTC
ambari git commit: AMBARI-8372. Distribute Repositories/Install
Components - custom action script - fix failing unit tests (os check broken
by 8de3425) (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 8eaf00328 -> 0a3463c97
AMBARI-8372. Distribute Repositories/Install Components - custom action script - fix failing unit tests (os check broken by 8de3425) (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a3463c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a3463c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a3463c9
Branch: refs/heads/trunk
Commit: 0a3463c973ad1ebdba8314e519d424da6a0aeffb
Parents: 8eaf003
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Nov 18 19:52:00 2014 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Nov 18 19:54:01 2014 +0200
----------------------------------------------------------------------
ambari-common/src/main/python/ambari_commons/os_check.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a3463c9/ambari-common/src/main/python/ambari_commons/os_check.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/ambari_commons/os_check.py b/ambari-common/src/main/python/ambari_commons/os_check.py
index 03e94c4..a7eb987 100644
--- a/ambari-common/src/main/python/ambari_commons/os_check.py
+++ b/ambari-common/src/main/python/ambari_commons/os_check.py
@@ -132,7 +132,6 @@ class OSConst:
class OSCheck:
- _dist = get_os_distribution()
@staticmethod
def get_os_os():
@@ -144,7 +143,7 @@ class OSCheck:
"""
# Read content from /etc/*-release file
# Full release name
- os_os = OSCheck._dist[0].lower()
+ os_os = get_os_distribution()[0].lower()
return os_os
@@ -161,7 +160,7 @@ class OSCheck:
"""
# Read content from /etc/*-release file
# Full release name
- operatingSystem = OSCheck._dist[2].lower()
+ operatingSystem = get_os_distribution()[2].lower()
# special cases
if os.path.exists('/etc/oracle-release'):
@@ -199,7 +198,7 @@ class OSCheck:
In case cannot detect raises exception.
"""
- dist = OSCheck._dist[3]
+ dist = get_os_distribution()[3]
if dist:
return dist
@@ -222,7 +221,7 @@ class OSCheck:
In case cannot detect raises exception.
"""
- dist = OSCheck._dist[4].lower()
+ dist = get_os_distribution()[4].lower()
if dist:
return dist