From b4cf920545959bf6cbb5f438b59b2cba6c0ff492 Mon Sep 17 00:00:00 2001
From: Jarl Stefansson <jarl@sdelements.com>
Date: Tue, 5 Nov 2013 11:22:59 -0500
Subject: Fix facter for versions

---
 lib/facter/python_version.rb        | 28 ++++++++++++++++++++++++++++
 lib/facter/system_python_version.rb | 26 --------------------------
 2 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 lib/facter/python_version.rb
 delete mode 100644 lib/facter/system_python_version.rb

(limited to 'lib')

diff --git a/lib/facter/python_version.rb b/lib/facter/python_version.rb
new file mode 100644
index 0000000..a2bdb26
--- /dev/null
+++ b/lib/facter/python_version.rb
@@ -0,0 +1,28 @@
+# Make python versions available as facts
+# In lists default python and system python versions
+require 'puppet'
+pkg = Puppet::Type.type(:package).new(:name => "python")
+
+Facter.add("system_python_version") do
+  setcode do
+    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
+        /^(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
+    end
+  end
+end
+
+Facter.add("python_version") do
+  has_weight 100
+  setcode do
+    /^.*(\d+\.\d+\.\d+)$/.match(Facter::Util::Resolution.exec('python -V'))[1]
+  end
+end
+
+Facter.add("python_version") do
+  has_weight 50
+  setcode do
+    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
+        /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
+    end
+  end
+end
diff --git a/lib/facter/system_python_version.rb b/lib/facter/system_python_version.rb
deleted file mode 100644
index 6df6ae4..0000000
--- a/lib/facter/system_python_version.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Make python versions available as facts
-# In lists default python and system python versions
-require 'puppet'
-pkg = Puppet::Type.type(:package).new(:name => "python")
-
-Facter.add("system_python_version") do
-  setcode do
-    /^(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
-  end
-end
-
-Facter.add("python_version") do
-  has_weight 100
-  setcode do
-    /^.*(\d+\.\d+\.\d+)$/.match(Facter::Util::Resolution.exec('python -V'))[1]
-  end
-end
-
-Facter.add("python_version") do
-  has_weight 50
-  setcode do
-    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
-        /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
-    end
-  end
-end
-- 
cgit v1.2.3