summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-08-10 13:55:39 -0700
committerNick Lewis <nick@puppetlabs.com>2011-08-10 14:04:20 -0700
commit44719fcf9f9053a7be1bea59d516f24d2234ede4 (patch)
tree31426cda5b8ae089d48aa533a834f0d5267c3f78 /lib/puppet
parentc50b213b716cc5d6a7e282225353cfa3e4637322 (diff)
downloadpuppet-44719fcf9f9053a7be1bea59d516f24d2234ede4.tar.gz
puppet-44719fcf9f9053a7be1bea59d516f24d2234ede4.tar.xz
puppet-44719fcf9f9053a7be1bea59d516f24d2234ede4.zip
Stop trying to make config directories in Windows specs
FileSetting#to_resource had a provision to not attempt to manage files in /dev, which effectively stopped spec from trying to make their configuration directories in /dev/null. However, on Windows, the path turns into something like C:/dev/null, so the specs were still trying to manage their configuration directories when this wasn't desired or handled by the spec. Now, we also exclude management of C:/dev (or similar), to mimic the behavior on Windows. Because this isn't a standard path (and thus will not be used for anything else), there seems to be no harm in treating it as though it were really /dev. Reviewed-By: Josh Cooper <josh@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/settings/file_setting.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb
index 776398ef4..0fa65d846 100644
--- a/lib/puppet/util/settings/file_setting.rb
+++ b/lib/puppet/util/settings/file_setting.rb
@@ -86,7 +86,7 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
path = File.expand_path(path)
return nil unless type == :directory or create_files? or File.exist?(path)
- return nil if path =~ /^\/dev/
+ return nil if path =~ /^\/dev/ or path =~ /^[A-Z]:\/dev/i
resource = Puppet::Resource.new(:file, path)