ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From crobe...@apache.org
Subject git commit: AMBARI-3609. os_type_check.sh for RHEL is too restrictive (Trevor McKay via croberts)
Date Thu, 05 Dec 2013 20:13:06 GMT
Updated Branches:
  refs/heads/trunk e40e12da5 -> c9a190453


AMBARI-3609.  os_type_check.sh for RHEL is too restrictive (Trevor McKay via croberts)

Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9a19045
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9a19045
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9a19045

Branch: refs/heads/trunk
Commit: c9a190453a735c0aaf50e0edea8751d08dbf3649
Parents: e40e12d
Author: Chad Roberts <croberts@redhat.com>
Authored: Thu Dec 5 15:09:21 2013 -0500
Committer: Chad Roberts <croberts@redhat.com>
Committed: Thu Dec 5 15:11:56 2013 -0500

----------------------------------------------------------------------
 ambari-server/src/main/python/os_type_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9a19045/ambari-server/src/main/python/os_type_check.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/os_type_check.sh b/ambari-server/src/main/python/os_type_check.sh
index e626063..167dfb3 100644
--- a/ambari-server/src/main/python/os_type_check.sh
+++ b/ambari-server/src/main/python/os_type_check.sh
@@ -43,8 +43,8 @@ then
 elif [ -f  "/etc/redhat-release" ]
 then
   grep -sqiE "^centos ${pattern}5" /etc/redhat-release && current_os=$C5
-  grep -sqE "^Red Hat Enterprise Linux Server ${pattern}6" /etc/redhat-release &&
current_os=$RH6
-  grep -sqE "^Red Hat Enterprise Linux Server ${pattern}5" /etc/redhat-release &&
current_os=$RH5
+  grep -sqE "^Red Hat Enterprise Linux ${pattern}6" /etc/redhat-release && current_os=$RH6
+  grep -sqE "^Red Hat Enterprise Linux ${pattern}5" /etc/redhat-release && current_os=$RH5
 elif [ -f  "/etc/SuSE-release" ]
 then
   grep -sqE "${pattern}11" /etc/SuSE-release && current_os=$SUSE11


Mime
View raw message