diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-08-22 17:06:44 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-08-22 17:06:44 -0700 |
| commit | 630ec36089e2224fba99b76d76eaf904af13e4d6 (patch) | |
| tree | a04dff02eb8f296f7a56952cade0621848280288 /lib/puppet/util/settings/file_setting.rb | |
| parent | 4684db12b1ca27df4d612fb1a54b7be43f54a6a8 (diff) | |
| parent | 0f207a8ea61205ba6b47e8da429ab3887b3cda4d (diff) | |
| download | puppet-630ec36089e2224fba99b76d76eaf904af13e4d6.tar.gz puppet-630ec36089e2224fba99b76d76eaf904af13e4d6.tar.xz puppet-630ec36089e2224fba99b76d76eaf904af13e4d6.zip | |
Merge pull request #53 from joshcooper/ticket/2.7.x/8662-root-on-windows
Ticket/2.7.x/8662 root on windows
Diffstat (limited to 'lib/puppet/util/settings/file_setting.rb')
| -rw-r--r-- | lib/puppet/util/settings/file_setting.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb index 0fa65d846..f02a0c547 100644 --- a/lib/puppet/util/settings/file_setting.rb +++ b/lib/puppet/util/settings/file_setting.rb @@ -93,7 +93,8 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting if Puppet[:manage_internal_file_permissions] resource[:mode] = self.mode if self.mode - if Puppet.features.root? + # REMIND fails on Windows because chown/chgrp functionality not supported yet + if Puppet.features.root? and !Puppet.features.microsoft_windows? resource[:owner] = self.owner if self.owner resource[:group] = self.group if self.group end |