From 384ea48e6219640a6b5d239a3399a2a978260387 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Mon, 28 Nov 2011 11:08:59 +0200 Subject: [PATCH] Fixed comment parsing for OpenBSD service provider --- custom/lib/puppet/provider/service/openbsd.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/custom/lib/puppet/provider/service/openbsd.rb b/custom/lib/puppet/provider/service/openbsd.rb index 3a3a84a..ed644f6 100644 --- a/custom/lib/puppet/provider/service/openbsd.rb +++ b/custom/lib/puppet/provider/service/openbsd.rb @@ -20,7 +20,10 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do def rcvar name = @resource[:name] File.open(@@rcconf).each do |line| - return line.strip.split("=", 2) if line =~ /^#{name}(_flags)?=/ + if line =~ /^#{name}(_flags)?=/ + line = line.sub(/#.*/, "") + return line.strip.split("=", 2) + end end nil end @@ -28,7 +31,10 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do def rcvar_local name = @resource[:name] File.open(@@rcconf_local).each do |line| - return line.strip.split("=", 2) if line =~ /^#{name}(_flags)?=/ + if line =~ /^#{name}(_flags)?=/ + line = line.sub(/#.*/, "") + return line.strip.split("=", 2) + end end nil end