diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-21 00:33:42 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-21 00:33:42 -0500 |
| commit | 65c61b99ffb2069205a37f5daa17444984b11ec5 (patch) | |
| tree | 7e2ee7ab6619d1e2ec8b33cc5939c6e55dcb0358 /lib/puppet/reference | |
| parent | 84a787a2a764a5035f7cbb8d30f94fc601bed154 (diff) | |
| parent | 4434072c7f51e4720b40aaea0637cb94dc6aefe5 (diff) | |
| download | puppet-65c61b99ffb2069205a37f5daa17444984b11ec5.tar.gz puppet-65c61b99ffb2069205a37f5daa17444984b11ec5.tar.xz puppet-65c61b99ffb2069205a37f5daa17444984b11ec5.zip | |
Merge branch 'ldap_fixes' into 0.24.x
Conflicts:
CHANGELOG
Diffstat (limited to 'lib/puppet/reference')
| -rw-r--r-- | lib/puppet/reference/providers.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb index 610c7550d..8fd2dbadc 100644 --- a/lib/puppet/reference/providers.rb +++ b/lib/puppet/reference/providers.rb @@ -63,9 +63,13 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider case test when :exists: details += " - Missing files %s\n" % values.join(", ") - when :facter: + when :variable: values.each do |name, facts| - details += " - Fact %s (currently %s) not in list %s\n" % [name, Facter.value(name).inspect, facts.join(", ")] + if Puppet.settings.valid?(name) + details += " - Setting %s (currently %s) not in list %s\n" % [name, Puppet.settings.value(name).inspect, facts.join(", ")] + else + details += " - Fact %s (currently %s) not in list %s\n" % [name, Facter.value(name).inspect, facts.join(", ")] + end end when :true: details += " - Got %s true tests that should have been false\n" % values |