From 54bd0ea054f3bb83ead3ff117c4dccaeb987cf91 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 19 May 2009 21:16:49 -0400 Subject: [PATCH 2/2] Tighten operatingsystemrelease regex on CentOS < 5 The previous check for /5/ matched releases like 4.5, which is not the intent. The previous check was introduced in 095eb15e, and changed the pattern from /^5^/. Using /^5/ to match when the release begins with 5 seems saner. --- lib/facter/operatingsystemrelease.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb index 4393bfa..0864b4d 100644 --- a/lib/facter/operatingsystemrelease.rb +++ b/lib/facter/operatingsystemrelease.rb @@ -54,7 +54,7 @@ Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{CentOS} setcode do centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \\((Branch|Final)\\)//' /etc/redhat-release") - if centos_release =~ /5/ + if centos_release =~ /^5/ release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2') else release = centos_release -- 1.6.3.1