From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 24 Oct 2006 17:22:21 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions clusterOS.py
Message-ID: <20061024172221.21825.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2006-10-24 17:22:20

Modified files:
	luci/site/luci/Extensions: clusterOS.py 

Log message:
	fc6 has a name now, and its /etc/redhat-release no longer contains the string 'FC6' we were looking for in the test versions. look for 'Zod' now, also.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/clusterOS.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2&r2=1.2.2.1

--- conga/luci/site/luci/Extensions/clusterOS.py	2006/10/11 21:48:04	1.2
+++ conga/luci/site/luci/Extensions/clusterOS.py	2006/10/24 17:22:20	1.2.2.1
@@ -1,5 +1,5 @@
 def resolveOSType(os_str):
-	if not os_str or os_str.find('Tikanga') != (-1) or os_str.find('FC6') != (-1):
+	if not os_str or os_str.find('Tikanga') != (-1) or os_str.find('FC6') != (-1) or os_str.find('Zod') != (-1):
 		return 'rhel5'
 	else:
 		return 'rhel4'