diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-08-17 14:44:03 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-08-17 14:44:03 -0700 |
| commit | cf95530964a067374f2ff8be0602342e47a55cc5 (patch) | |
| tree | eeec7ada4ec86ededf527fe2108f839251e41869 /lib/puppet/application/resource.rb | |
| parent | 54fb365120463e240328cd6fe507423e6d022110 (diff) | |
| parent | 99678f26369f7ac57a4125b6b391f2db832bbb4b (diff) | |
| download | puppet-cf95530964a067374f2ff8be0602342e47a55cc5.tar.gz puppet-cf95530964a067374f2ff8be0602342e47a55cc5.tar.xz puppet-cf95530964a067374f2ff8be0602342e47a55cc5.zip | |
Merge branch '2.7.x'
Diffstat (limited to 'lib/puppet/application/resource.rb')
| -rw-r--r-- | lib/puppet/application/resource.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/application/resource.rb b/lib/puppet/application/resource.rb index 6ef87d68f..76d0fada8 100644 --- a/lib/puppet/application/resource.rb +++ b/lib/puppet/application/resource.rb @@ -183,6 +183,9 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License [ Puppet::Resource.indirection.save(Puppet::Resource.new( type, name, :parameters => params ), key) ] end else + if type == "file" + raise "Listing all file instances is not supported. Please specify a file or directory, e.g. puppet resource file /etc" + end Puppet::Resource.indirection.search( key, {} ) end.map(&format).join("\n") |