diff options
author | Markus Roberts <Markus@reality.com> | 2010-07-09 18:01:33 -0700 |
---|---|---|
committer | Markus Roberts <Markus@reality.com> | 2010-07-09 18:01:33 -0700 |
commit | 77f8599f55be12bf5c7d69ac8f439d1fd756eafc (patch) | |
tree | e8db2af5836d6fb4e3061531d570ffd24a087373 /lib/puppet/util.rb | |
parent | 3fbc1d57f07598de225ac805ff000733480c9ff8 (diff) | |
download | puppet-77f8599f55be12bf5c7d69ac8f439d1fd756eafc.tar.gz puppet-77f8599f55be12bf5c7d69ac8f439d1fd756eafc.tar.xz puppet-77f8599f55be12bf5c7d69ac8f439d1fd756eafc.zip |
Code smell: Win32 --> MS_windows
* Replaced 12 occurances of Win32 with Microsoft Windows
3 Examples:
The code:
# and all .rb files in lib/. This is disabled by default on Win32.
becomes:
# and all .rb files in lib/. This is disabled by default on Microsoft Windows.
The code:
# We can use Win32 functions
becomes:
# We can use Microsoft Windows functions
The code:
desc "Uses Win32 functionality to manage file's users and rights."
becomes:
desc "Uses Microsoft Windows functionality to manage file's users and rights."
* Replaced 10 occurances of :win32 with :microsoft_windows
3 Examples:
The code:
Puppet.features.add(:win32, :libs => ["sys/admin", "win32/process", "win32/dir"])
becomes:
Puppet.features.add(:microsoft_windows, :libs => ["sys/admin", "win32/process", "win32/dir"])
The code:
Puppet::Type.type(:file).provide :win32 do
becomes:
Puppet::Type.type(:file).provide :microsoft_windows do
The code:
confine :feature => :win32
becomes:
confine :feature => :microsoft_windows
* Replaced 13 occurances of win32\? with microsoft_windows?
3 Examples:
The code:
signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.win32?
becomes:
signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.microsoft_windows?
The code:
raise Puppet::Error,"Cannot determine basic system flavour" unless Puppet.features.posix? or Puppet.features.win32?
becomes:
raise Puppet::Error,"Cannot determine basic system flavour" unless Puppet.features.posix? or Puppet.features.microsoft_windows?
The code:
require 'sys/admin' if Puppet.features.win32?
becomes:
require 'sys/admin' if Puppet.features.microsoft_windows?
Diffstat (limited to 'lib/puppet/util.rb')
-rw-r--r-- | lib/puppet/util.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index 3dd84f9a5..f9786fbe0 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -315,7 +315,7 @@ module Util exit!(1) end # begin; rescue end # if child_pid - elsif Puppet.features.win32? + elsif Puppet.features.microsoft_windows? command = command.collect {|part| '"' + part.gsub(/"/, '\\"') + '"'}.join(" ") if command.is_a?(Array) Puppet.debug "Creating process '%s'" % command processinfo = Process.create( |