From e704c9fe1c40fea5b10fe3ca2b4f5de825341cc6 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 26 Jan 2016 17:04:36 +0100
Subject: [bug] Use $operatingsystemrelease instead of
 $operatingsystemmajrelease

Latter one depends on facter 2.x, wheezy ships 1.6.10 by default.
---
 manifests/bcrypt.pp    | 2 +-
 manifests/init.pp      | 2 +-
 manifests/mail.pp      | 2 +-
 manifests/maildir.pp   | 2 +-
 manifests/postgres.pp  | 2 +-
 manifests/xmlsimple.pp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/bcrypt.pp b/manifests/bcrypt.pp
index e83bc66..4c64647 100644
--- a/manifests/bcrypt.pp
+++ b/manifests/bcrypt.pp
@@ -1,6 +1,6 @@
 class rubygems::bcrypt {
   if ($::osfamily == 'RedHat') and
-    versioncmp($::operatingsystemmajrelease,'6') > 0 {
+    versioncmp($::operatingsystemrelease,'6') > 0 {
     package{'rubygem-bcrypt':
       ensure => present,
     }
diff --git a/manifests/init.pp b/manifests/init.pp
index 0b6198d..bca40b9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,7 +16,7 @@
 # manage rubygems basics
 class rubygems {
   # from debian 8 on this is not anymore needed as it's part of the ruby pkg
-  if ($::operatingsystem != 'Debian') or (versioncmp($::operatingsystemmajrelease,'8') < 0) {
+  if ($::operatingsystem != 'Debian') or (versioncmp($::operatingsystemrelease,'8') < 0) {
     package{'rubygems':
       ensure => installed,
     }
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 17de50e..b8b50bb 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -1,7 +1,7 @@
 # manage the mail rubygem
 class rubygems::mail {
   if ($::osfamily == 'RedHat') and
-    versioncmp($::operatingsystemmajrelease,'6') > 0 {
+    versioncmp($::operatingsystemrelease,'6') > 0 {
     package{'rubygem-mail':
       ensure => present,
     }
diff --git a/manifests/maildir.pp b/manifests/maildir.pp
index 14bbc62..8773f37 100644
--- a/manifests/maildir.pp
+++ b/manifests/maildir.pp
@@ -1,7 +1,7 @@
 # manage maildir rubygem
 class rubygems::maildir {
   if ($::osfamily == 'RedHat') and
-    versioncmp($::operatingsystemmajrelease,'6') > 0 {
+    versioncmp($::operatingsystemrelease,'6') > 0 {
     package{'rubygem-maildir':
       ensure => present,
     }
diff --git a/manifests/postgres.pp b/manifests/postgres.pp
index af7c563..8720f4e 100644
--- a/manifests/postgres.pp
+++ b/manifests/postgres.pp
@@ -1,6 +1,6 @@
 class rubygems::postgres {
   if $::osfamily == 'RedHat' and
-    versioncmp($::operatingsystemmajrelease,'5') > 0 {
+    versioncmp($::operatingsystemrelease,'5') > 0 {
     package{'rubygem-pg':
       ensure => installed,
     }
diff --git a/manifests/xmlsimple.pp b/manifests/xmlsimple.pp
index 7b00204..914156b 100644
--- a/manifests/xmlsimple.pp
+++ b/manifests/xmlsimple.pp
@@ -10,7 +10,7 @@ class rubygems::xmlsimple {
       }
     }
   }
-  if $::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > 6 {
+  if $::operatingsystem == 'CentOS' and versioncmp($::operatingsystemrelease, '6') > 0 {
     # not yet packaged
     Package['rubygem-xml-simple']{
       name     => 'xml-simple',
-- 
cgit v1.2.3