puppet 8.3.1-x86-mingw32 → 8.5.0-x86-mingw32

data/lib/puppet/provider/package/zypper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11.
 
@@ -38,17 +39,18 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       pkg_ver = line.split(/\s*\|\s*/)
       # ignore zypper headers
       next unless pkg_ver[0] == 'v'
+
       avail_updates[pkg_ver[2]] = pkg_ver[4]
     end
 
     avail_updates
   end
 
-  #on zypper versions <1.0, the version option returns 1
-  #some versions of zypper output on stderr
+  # on zypper versions <1.0, the version option returns 1
+  # some versions of zypper output on stderr
   def zypper_version
-    cmd = [self.class.command(:zypper),"--version"]
-    execute(cmd, { :failonfail => false, :combine => true})
+    cmd = [self.class.command(:zypper), "--version"]
+    execute(cmd, { :failonfail => false, :combine => true })
   end
 
   def best_version(should)
@@ -70,6 +72,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       output.lines.each do |line|
         pkg_ver = line.split(/\s*\|\s*/)
         next unless pkg_ver[1] == @resource[:name]
+
         begin
           rpm_version = Puppet::Util::Package::Version::Rpm.parse(pkg_ver[3])
 
@@ -102,17 +105,17 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       wanted = "#{wanted}-#{should}"
     end
 
-    #This has been tested with following zypper versions
-    #SLE 10.4: 0.6.201
-    #SLE 11.3: 1.6.307
-    #SLE 12.0: 1.11.14
-    #Assume that this will work on newer zypper versions
+    # This has been tested with following zypper versions
+    # SLE 10.4: 0.6.201
+    # SLE 11.3: 1.6.307
+    # SLE 12.0: 1.11.14
+    # Assume that this will work on newer zypper versions
 
-    #extract version numbers and convert to integers
-    major, minor, patch = zypper_version.scan(/\d+/).map{ |x| x.to_i }
+    # extract version numbers and convert to integers
+    major, minor, patch = zypper_version.scan(/\d+/).map { |x| x.to_i }
     self.debug "Detected zypper version #{major}.#{minor}.#{patch}"
 
-    #zypper version < 1.0 does not support --quiet flag
+    # zypper version < 1.0 does not support --quiet flag
     if major < 1
       quiet = '--terse'
     else
@@ -122,14 +125,13 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
     inst_opts = []
     inst_opts = install_options if resource[:install_options]
 
-
     options = []
     options << quiet
     options << '--no-gpg-check' unless inst_opts.delete('--no-gpg-check').nil?
     options << '--no-gpg-checks' unless inst_opts.delete('--no-gpg-checks').nil?
     options << :install
 
-    #zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
+    # zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
     options << '--auto-agree-with-licenses' unless major < 1 and minor <= 6 and patch <= 13
     options << '--no-confirm'
     options += inst_opts unless inst_opts.empty?
@@ -152,9 +154,9 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   # What's the latest package version available?
   def latest
     return self.class.latest_package_version(@resource[:name]) ||
-      # zypper didn't find updates, pretend the current
-      # version is the latest
-      @property_hash[:ensure]
+           # zypper didn't find updates, pretend the current
+           # version is the latest
+           @property_hash[:ensure]
   end
 
   def update
@@ -163,22 +165,21 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   end
 
   def uninstall
-    #extract version numbers and convert to integers
-    major, minor, _ = zypper_version.scan(/\d+/).map{ |x| x.to_i }
+    # extract version numbers and convert to integers
+    major, minor, _ = zypper_version.scan(/\d+/).map { |x| x.to_i }
 
     if major < 1
       super
     else
       options = [:remove, '--no-confirm']
       if major == 1 && minor < 6
-          options << '--force-resolution'
+        options << '--force-resolution'
       end
 
       options << @resource[:name]
 
       zypper(*options)
     end
-
   end
 
   def insync?(is)

data/lib/puppet/provider/package.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 
 class Puppet::Provider::Package < Puppet::Provider
@@ -24,7 +25,7 @@ class Puppet::Provider::Package < Puppet::Provider
       # Purged is the "most uninstalled" a package can be, so a purged package will be in-sync with
       # either `ensure => absent` or `ensure => purged`; an absent package will be out of sync with `ensure => purged`.
       default_status = self.class.feature?(:purgeable) ? :purged : :absent
-      @property_hash = query || { :ensure => ( default_status )}
+      @property_hash = query || { :ensure => (default_status) }
       @property_hash[:ensure] = default_status if @property_hash.empty?
     end
     @property_hash.dup
@@ -48,12 +49,12 @@ class Puppet::Provider::Package < Puppet::Provider
 
     options.collect do |val|
       case val
-        when Hash
-          val.keys.sort.collect do |k|
-            "#{k}=#{val[k]}"
-          end
-        else
-          val
+      when Hash
+        val.keys.sort.collect do |k|
+          "#{k}=#{val[k]}"
+        end
+      else
+        val
       end
     end.flatten
   end

data/lib/puppet/provider/package_targetable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Targetable package providers implement a `command` attribute.
 #
 # The `packages` hash passed to `Puppet::Provider::Package::prefetch` is deduplicated,
@@ -26,8 +27,8 @@ require_relative '../../puppet/provider/package'
 class Puppet::Provider::Package::Targetable < Puppet::Provider::Package
   # Prefetch our package list, yo.
   def self.prefetch(packages)
-    catalog_packages = packages.values.first.catalog.resources.select{ |p| p.provider.class == self }
-    package_commands = catalog_packages.map { |catalog_package| catalog_package::original_parameters[:command] }.uniq
+    catalog_packages = packages.values.first.catalog.resources.select { |p| p.provider.instance_of?(self) }
+    package_commands = catalog_packages.map { |catalog_package| catalog_package.original_parameters[:command] }.uniq
     package_commands.each do |command|
       instances(command).each do |instance|
         catalog_packages.each do |catalog_package|

data/lib/puppet/provider/parsedfile.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/util/filetype'
 require_relative '../../puppet/util/fileparsing'
@@ -71,7 +72,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
       modified(record[:target] || default_target)
     end
 
-    return unless defined?(@modified) and ! @modified.empty?
+    return unless defined?(@modified) and !@modified.empty?
 
     flushed = []
     begin
@@ -115,7 +116,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Return the header placed at the top of each generated file, warning
   # users that modifying this file manually is probably a bad idea.
   def self.header
-%{# HEADER: This file was autogenerated at #{Time.now}
+    %{# HEADER: This file was autogenerated at #{Time.now}
 # HEADER: by puppet.  While it can still be managed manually, it
 # HEADER: is definitely not recommended.\n}
   end
@@ -186,12 +187,10 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         # return the should value, so the resource shuts up.
         if @property_hash[attr] or self.class.valid_attr?(self.class.name, attr)
           @property_hash[attr] || :absent
+        elsif defined?(@resource)
+          @resource.should(attr)
         else
-          if defined?(@resource)
-            @resource.should(attr)
-          else
-            nil
-          end
+          nil
         end
       end
 
@@ -236,6 +235,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # @param [Array<Puppet::Resource>] resources A list of resources using this class as a provider
   def self.match_providers_with_resources(resources)
     return unless resources
+
     matchers = resources.dup
     @records.each do |record|
       # Skip things like comments and blank lines
@@ -314,6 +314,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Is there an existing record with this name?
   def self.record?(name)
     return nil unless @records
+
     @records.find { |r| r[:name] == name }
   end
 
@@ -380,6 +381,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     targets = []
     # First get the default target
     raise Puppet::DevError, _("Parsed Providers must define a default target") unless self.default_target
+
     targets << self.default_target
 
     # Then get each of the file objects
@@ -387,7 +389,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
     # Lastly, check the file from any resource instances
     if resources
-      resources.each do |name, resource|
+      resources.each do |_name, resource|
         value = resource.should(:target)
         if value
           targets << value
@@ -465,12 +467,13 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     # The 'record' could be a resource or a record, depending on how the provider
     # is initialized.  If we got an empty property hash (probably because the resource
     # is just being initialized), then we want to set up some defaults.
-    @property_hash = self.class.record?(resource[:name]) || {:record_type => self.class.name, :ensure => :absent} if @property_hash.empty?
+    @property_hash = self.class.record?(resource[:name]) || { :record_type => self.class.name, :ensure => :absent } if @property_hash.empty?
   end
 
   # Retrieve the current state from disk.
   def prefetch
     raise Puppet::DevError, _("Somehow got told to prefetch with no resource set") unless @resource
+
     self.class.prefetch(@resource[:name] => @resource)
   end
 

data/lib/puppet/provider/service/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :base, :parent => :service do
   desc "The simplest form of Unix service support.
 
@@ -105,7 +106,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       return @resource[:binary]
     else
       raise Puppet::Error,
-        "Services must specify a start command or a binary"
+            "Services must specify a start command or a binary"
     end
   end
 
@@ -137,4 +138,3 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   def stopcmd
   end
 end
-

data/lib/puppet/provider/service/bsd.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :bsd, :parent => :init do
   desc <<-EOT
     Generic BSD form of `init`-style service management with `rc.d`.

data/lib/puppet/provider/service/daemontools.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Daemontools service management
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
@@ -40,7 +41,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
 
   EOT
 
-  commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
+  commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
 
   class << self
     attr_writer :defpath
@@ -73,7 +74,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     # or don't contain a run file
     Dir.entries(path).reject { |e|
       fullpath = File.join(path, e)
-      e =~ /^\./ or ! FileTest.directory?(fullpath) or ! Puppet::FileSystem.exist?(File.join(fullpath,"run"))
+      e =~ /^\./ or !FileTest.directory?(fullpath) or !Puppet::FileSystem.exist?(File.join(fullpath, "run"))
     }.collect do |name|
       new(:name => name, :path => path)
     end
@@ -87,7 +88,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   # find the service dir on this node
   def servicedir
     unless @servicedir
-      ["/service", "/etc/service","/var/lib/svscan"].each do |path|
+      ["/service", "/etc/service", "/var/lib/svscan"].each do |path|
         if Puppet::FileSystem.exist?(path)
           @servicedir = path
           break
@@ -110,6 +111,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   def daemon
     path = resource[:path]
     raise Puppet::Error.new("#{self.class.name} must specify a path for daemon directory") unless path
+
     File.join(path, resource[:name])
   end
 
@@ -120,19 +122,19 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         return :running
       end
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}", detail)
+      raise Puppet::Error.new("Could not get status for service #{resource.ref}: #{detail}", detail)
     end
     :stopped
   end
 
   def setupservice
-      if resource[:manifest]
-        Puppet.notice "Configuring #{resource[:name]}"
-        command = [ resource[:manifest], resource[:name] ]
-        system("#{command}")
-      end
+    if resource[:manifest]
+      Puppet.notice "Configuring #{resource[:name]}"
+      command = [resource[:manifest], resource[:name]]
+      system("#{command}")
+    end
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}", detail)
+    raise Puppet::Error.new("Cannot config #{self.service} to enable it: #{detail}", detail)
   end
 
   def enabled?
@@ -147,23 +149,23 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   end
 
   def enable
-    if ! FileTest.directory?(self.daemon)
+    if !FileTest.directory?(self.daemon)
       Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
       self.setupservice
     end
     if self.daemon
-      if ! Puppet::FileSystem.symlink?(self.service)
+      if !Puppet::FileSystem.symlink?(self.service)
         Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
         Puppet::FileSystem.symlink(self.daemon, self.service)
       end
     end
   rescue Puppet::ExecutionFailure
-    raise Puppet::Error.new( "No daemon directory found for #{self.service}", $!)
+    raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
   end
 
   def disable
     begin
-      if ! FileTest.directory?(self.daemon)
+      if !FileTest.directory?(self.daemon)
         Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
         self.setupservice
       end
@@ -174,7 +176,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         end
       end
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new( "No daemon directory found for #{self.service}", $!)
+      raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
     end
     self.stop
   end

data/lib/puppet/provider/service/debian.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage debian services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :debian, :parent => :init do
@@ -20,8 +21,8 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
   confine :false => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
-  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ['1','2']
-  defaultfor 'os.name' => :debian, 'os.release.major' => ['5','6','7']
+  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ['1', '2']
+  defaultfor 'os.name' => :debian, 'os.release.major' => ['5', '6', '7']
   defaultfor 'os.name' => :devuan
 
   # Remove the symlinks
@@ -68,9 +69,9 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   end
 
   def statuscmd
-      # /usr/sbin/service provides an abstraction layer which is able to query services
-      # independent of the init system used.
-      # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775795
+    # /usr/sbin/service provides an abstraction layer which is able to query services
+    # independent of the init system used.
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775795
     (@resource[:hasstatus] == :true) && [command(:service), @resource[:name], "status"]
   end
 end

data/lib/puppet/provider/service/freebsd.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
+Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   desc "Provider for FreeBSD and DragonFly BSD. Uses the `rcvar` argument of init scripts and parses/edits rc files."
 
   confine 'os.name' => [:freebsd, :dragonfly]
@@ -23,7 +23,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def rcvar
     rcvar = execute([self.initscript, :rcvar], :failonfail => true, :combine => false, :squelch => false)
     rcvar = rcvar.split("\n")
-    rcvar.delete_if {|str| str =~ /^#\s*$/}
+    rcvar.delete_if { |str| str =~ /^#\s*$/ }
     rcvar[1] = rcvar[1].gsub(/^\$/, '')
     rcvar
   end
@@ -75,7 +75,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
       if Puppet::FileSystem.exist?(filename)
         s = File.read(filename)
         if s.gsub!(/^(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
-          Puppet::FileSystem.replace_file(filename) { |f| f << s  }
+          Puppet::FileSystem.replace_file(filename) { |f| f << s }
           self.debug("Replaced in #{filename}")
           success = true
         end
@@ -89,24 +89,22 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     append = "\# Added by Puppet\n#{rcvar}_enable=\"#{yesno}\"\n"
     # First, try the one-file-per-service style
     if Puppet::FileSystem.exist?(rcconf_dir)
-      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) {
-        |f| f << append
+      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+        f << append
         self.debug("Appended to #{f.path}")
       }
-    else
+    elsif Puppet::FileSystem.exist?(rcconf_local)
       # Else, check the local rc file first, but don't create it
-      if Puppet::FileSystem.exist?(rcconf_local)
-        File.open(rcconf_local, File::WRONLY | File::APPEND) {
-          |f| f << append
-          self.debug("Appended to #{f.path}")
-        }
-      else
-        # At last use the standard rc.conf file
-        File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0644) {
-          |f| f << append
-          self.debug("Appended to #{f.path}")
-        }
-      end
+      File.open(rcconf_local, File::WRONLY | File::APPEND) { |f|
+        f << append
+        self.debug("Appended to #{f.path}")
+      }
+    else
+      # At last use the standard rc.conf file
+      File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+        f << append
+        self.debug("Appended to #{f.path}")
+      }
     end
   end
 
@@ -140,5 +138,4 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def statuscmd
     [self.initscript, :onestatus]
   end
-
 end

data/lib/puppet/provider/service/gentoo.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage gentoo services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :gentoo, :parent => :init do
@@ -14,9 +15,9 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
   confine 'os.name' => :gentoo
 
   def disable
-      output = update :del, @resource[:name], :default
+    output = update :del, @resource[:name], :default
   rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
+    raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
   end
 
   def enabled?
@@ -39,8 +40,8 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
   end
 
   def enable
-      output = update :add, @resource[:name], :default
+    output = update :add, @resource[:name], :default
   rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
+    raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
   end
 end

data/lib/puppet/provider/service/init.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The standard init-based service type.  Many other service types are
 # customizations of this module.
 Puppet::Type.type(:service).provide :init, :parent => :base do
@@ -20,15 +21,12 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   # Debian and Ubuntu should use the Debian provider.
+  confine :false => ['Debian', 'Ubuntu'].include?(Puppet.runtime[:facter].value('os.name'))
   # RedHat systems should use the RedHat provider.
-  confine :true => begin
-      os = Puppet.runtime[:facter].value('os.name').downcase
-      family = Puppet.runtime[:facter].value('os.family').downcase
-      !(os == 'debian' || os == 'ubuntu' || family == 'redhat')
-  end
+  confine :false => Puppet.runtime[:facter].value('os.family') == 'RedHat'
 
   # We can't confine this here, because the init path can be overridden.
-  #confine :exists => defpath
+  # confine :exists => defpath
 
   # some init scripts are not safe to execute, e.g. we do not want
   # to suddenly run /etc/init.d/reboot.sh status and reboot our system. The
@@ -57,9 +55,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # Prevent puppet failing on unsafe scripts from Yocto Linux
     if Puppet.runtime[:facter].value('os.family') == "cisco-wrlinux"
       excludes += %w{banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
-                   hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
-                   rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
-                   umountnfs.sh}
+                     hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
+                     rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
+                     umountnfs.sh}
     end
     # Prevent puppet failing to get status of the new service introduced
     # by the fix for this (bug https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/982889)
@@ -101,6 +99,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         next if Puppet::FileSystem.directory?(fullpath)
         next unless Puppet::FileSystem.executable?(fullpath)
         next unless is_init?(fullpath)
+
         instances << new(:name => name, :path => path, :hasstatus => true)
       end
     end
@@ -139,7 +138,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   def search(name)
     paths.each do |path|
-      fqname = File.join(path,name)
+      fqname = File.join(path, name)
       if Puppet::FileSystem.exist? fqname
         return fqname
       else
@@ -148,7 +147,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 
     paths.each do |path|
-      fqname_sh = File.join(path,"#{name}.sh")
+      fqname_sh = File.join(path, "#{name}.sh")
       if Puppet::FileSystem.exist? fqname_sh
         return fqname_sh
       else
@@ -174,7 +173,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   def service_execute(type, command, fof = true, squelch = false, combine = true)
     if type == :start && Puppet.runtime[:facter].value('os.family') == "Solaris"
-        command =  ["/usr/bin/ctrun -l child", command].flatten.join(" ")
+      command = ["/usr/bin/ctrun -l child", command].flatten.join(" ")
     end
     super(type, command, fof, squelch, combine)
   end
@@ -186,11 +185,10 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     (@resource[:hasstatus] == :true) && [initscript, :status]
   end
 
-private
+  private
 
   def self.is_init?(script = initscript)
     file = Puppet::FileSystem.pathname(script)
     !Puppet::FileSystem.symlink?(file) || Puppet::FileSystem.readlink(file) != "/lib/init/upstart-job"
   end
 end
-