summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/handler
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-04-27 13:53:20 +1000
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitd20d5de05b855a95eb92e5caa603634d5d082671 (patch)
tree9956e1ba278ab880d3fc6a4fdf9518e6439e8001 /lib/puppet/network/handler
parent6ae6821e6392ea2076e19b764db04366e92e86c1 (diff)
downloadpuppet-d20d5de05b855a95eb92e5caa603634d5d082671.tar.gz
puppet-d20d5de05b855a95eb92e5caa603634d5d082671.tar.xz
puppet-d20d5de05b855a95eb92e5caa603634d5d082671.zip
Fixed #3672 - Error message on duplicate fileserver mounts incorrect
Diffstat (limited to 'lib/puppet/network/handler')
-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 7049fb0dc..bed232fc3 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -283,8 +283,8 @@ class Puppet::Network::Handler
when /\[([-\w]+)\]/
name = $1
if newmounts.include?(name)
- raise FileServerError, "%s is already mounted at %s" %
- [newmounts[name], name], count, @configuration.file
+ raise FileServerError, "%s is already mounted as %s in %s" %
+ [newmounts[name], name, @configuration.file]
end
mount = Mount.new(name)
newmounts[name] = mount