summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-07-06 00:54:51 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-07-06 00:54:51 +0000
commit8b14ef8929bdf612071556e24b42ffa1163ed5b3 (patch)
tree423bb49d845e13739e7110b3d589d37e3491be89
parent32e5bff4cfe9c14666af0c5134042df4f50e8184 (diff)
downloadpuppet-8b14ef8929bdf612071556e24b42ffa1163ed5b3.tar.gz
puppet-8b14ef8929bdf612071556e24b42ffa1163ed5b3.tar.xz
puppet-8b14ef8929bdf612071556e24b42ffa1163ed5b3.zip
Fixing logging of module mounts; it was using the module as the name, rather than the module name
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2653 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xlib/puppet/network/handler/fileserver.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index 2b9b6b4b0..fdf515d6e 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -393,7 +393,7 @@ class Puppet::Network::Handler
mod = Puppet::Module::find(tmp)
if mod
- mount = @mounts[MODULES].copy(mod, mod.files)
+ mount = @mounts[MODULES].copy(mod.name, mod.files)
else
unless mount = @mounts[tmp]
raise FileServerError, "Fileserver module '%s' not mounted" % tmp
@@ -632,7 +632,7 @@ class Puppet::Network::Handler
end
def to_s
- "mount[#{@name}]"
+ "mount[%s]" % @name
end
# Verify our configuration is valid. This should really check to