diff options
Diffstat (limited to 'lib/puppet/type')
| -rwxr-xr-x | lib/puppet/type/exec.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/type/file.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/type/file/target.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb index 0cb345af1..065f1b65d 100755 --- a/lib/puppet/type/exec.rb +++ b/lib/puppet/type/exec.rb @@ -575,7 +575,7 @@ module Puppet exe = path end end - elsif Puppet.features.win32? and !File.exists?(exe) + elsif Puppet.features.microsoft_windows? and !File.exists?(exe) self[:path].each do |path| [".exe", ".ps1", ".bat", ".com", ""].each do |extension| file = File.join(path, exe+extension) diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index 37820b30f..1995c40fa 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -34,7 +34,7 @@ Puppet::Type.newtype(:file) do validate do |value| # accept various path syntaxes: lone slash, posix, win32, unc - unless (Puppet.features.posix? and (value =~ /^\/$/ or value =~ /^\/[^\/]/)) or (Puppet.features.win32? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/)) + unless (Puppet.features.posix? and (value =~ /^\/$/ or value =~ /^\/[^\/]/)) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/)) fail Puppet::Error, "File paths must be fully qualified, not '#{value}'" end end diff --git a/lib/puppet/type/file/target.rb b/lib/puppet/type/file/target.rb index 6987328b6..e4a188c85 100644 --- a/lib/puppet/type/file/target.rb +++ b/lib/puppet/type/file/target.rb @@ -23,7 +23,7 @@ module Puppet # Create our link. def mklink - raise Puppet::Error, "Cannot symlink on Win32" if Puppet.features.win32? + raise Puppet::Error, "Cannot symlink on Microsoft Windows" if Puppet.features.microsoft_windows? target = self.should |