summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-04-27 23:20:25 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-04-27 23:20:25 +0000
commit94bd3b28284f92583d6c49165d0dff1560e888ff (patch)
treeab29d724ab990d20a5c6cadcf019e05953909e66 /lib
parent96eed993c3079cb5aa785a8f10b0d8f317e00193 (diff)
downloadpuppet-94bd3b28284f92583d6c49165d0dff1560e888ff.tar.gz
puppet-94bd3b28284f92583d6c49165d0dff1560e888ff.tar.xz
puppet-94bd3b28284f92583d6c49165d0dff1560e888ff.zip
Apparently I messed up providers a bit; binaries were not having their full paths returned, which made most providers suddenly unsuitable. This fixes that, and adds tests to verify behaviour.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2426 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/provider.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb
index d2d8ca1f7..a9c6c09eb 100644
--- a/lib/puppet/provider.rb
+++ b/lib/puppet/provider.rb
@@ -38,6 +38,7 @@ class Puppet::Provider
# Define commands that are not optional.
def self.commands(hash)
optional_commands(hash) do |name, path|
+ Puppet.info "%s => %s" % [name, path]
confine :exists => path
end
end
@@ -163,6 +164,7 @@ class Puppet::Provider
# Try to find the full path (or verify already-full paths); otherwise
# store that the command is missing so we know it's defined but absent.
if tmp = binary(path)
+ path = tmp
@commands[name] = path
else
@commands[name] = :missing