Ryan Barry has uploaded a new change for review. Change subject: Puppet plugin: fix the 'require' in operatingsystem.rb ......................................................................
Puppet plugin: fix the 'require' in operatingsystem.rb Previously, the patch did not surround it with quotes, leading Ruby to attempt to parse "ovirt.rb" as a variable. Quote it so it parses as expected. Change-Id: I4a4c4cba3f46249c9b3c87d37657f648093414f2 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1003440 Signed-off-by: Ryan Barry <[email protected]> --- M plugins/puppet-operatingsystem.rb.patch 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/35/20135/1 diff --git a/plugins/puppet-operatingsystem.rb.patch b/plugins/puppet-operatingsystem.rb.patch index 3af2af8..5be1cf1 100644 --- a/plugins/puppet-operatingsystem.rb.patch +++ b/plugins/puppet-operatingsystem.rb.patch @@ -5,7 +5,7 @@ # Caveats: # +$LOAD_PATH.unshift('/var/lib/puppet/facts') -+require ovirt.rb ++require 'ovirt.rb' Facter.add(:operatingsystem) do confine :kernel => :sunos @@ -17,8 +17,8 @@ - "Ubuntu" + if FileTest.exists?("/etc/default/version") + txt = File.read("/etc/default/version") -+ if txt =~ /^PRODUCT='(.*?)\s/ -+ $1 ++ if txt =~ /^PRODUCT='(.*?)'/ ++ $1.gsub(/\s/, '') + end + elsif Facter.value(:lsbdistid) == "Ubuntu" + "Ubuntu" -- To view, visit http://gerrit.ovirt.org/20135 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a4c4cba3f46249c9b3c87d37657f648093414f2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
