From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 5 Jun 2007 05:28:04 -0000 Subject: [Cluster-devel] conga/luci/site/luci/Extensions HelperFunctions.py Message-ID: <20070605052804.16899.qmail@sourceware.org> List-Id: 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: EXPERIMENTAL Changes by: rmccabe at sourceware.org 2007-06-05 05:28:03 Modified files: luci/site/luci/Extensions: HelperFunctions.py Log message: Look for the Fedora 7 name. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/HelperFunctions.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.6.4.3&r2=1.6.4.4 --- conga/luci/site/luci/Extensions/HelperFunctions.py 2007/05/15 21:42:21 1.6.4.3 +++ conga/luci/site/luci/Extensions/HelperFunctions.py 2007/06/05 05:28:03 1.6.4.4 @@ -9,7 +9,7 @@ import threading def resolveOSType(os_str): - if not os_str or os_str.find('Tikanga') != (-1) or os_str.find('FC6') != (-1) or os_str.find('Zod') != (-1) or os_str.find('Fedora release 6.9') != (-1): + if not os_str or os_str.find('Tikanga') != (-1) or os_str.find('FC6') != (-1) or os_str.find('Zod') != (-1) or os_str.find('Moonshine') != (-1): return 'rhel5' else: return 'rhel4'