[node-patches] Change in ovirt-node[master]: Puppet plugin: patch the right file on EL6

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Puppet plugin: patch the right file on EL6
......................................................................

Puppet plugin: patch the right file on EL6

Previously, we assumed that facter's libraries would be in
one directory, but they are not there on EL6. Patch the correct
file.

Change-Id: I1db007a1dbe07628136d2092af7ae1ad15f9588b
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M ovirt-node.spec.in
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/33/20133/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index a259744..76099e6 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -143,9 +143,12 @@
 This package provides a puppet plugin for use with %{product_family} image.
 
 %post plugin-puppet
+%if %{is_el6}
+patch -d /usr/lib/ruby/site_ruby/1.8/facter -p0 < \
+%else
 patch -d /usr/share/ruby/vendor_ruby/facter -p0 < \
+%endif
    %{app_root}/puppet-plugin/puppet-operatingsystem.rb.patch
-
 cd /etc/puppet
 patch -p0 << EOF
 --- puppet.conf 2013-03-21 14:55:43.969130799 -0700


-- 
To view, visit http://gerrit.ovirt.org/20133
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1db007a1dbe07628136d2092af7ae1ad15f9588b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>