summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-04-27 13:53:20 +1000
committerJames Turnbull <james@lovedthanlost.net>2010-04-27 13:53:20 +1000
commite4130af8b035fc8f62561c01a092327d96d12658 (patch)
tree904a63e74b8e7a255584932f7fb801d5ab48786e
parent1275a474a4df42663a86421d0211275a14f2f6c3 (diff)
downloadpuppet-e4130af8b035fc8f62561c01a092327d96d12658.tar.gz
puppet-e4130af8b035fc8f62561c01a092327d96d12658.tar.xz
puppet-e4130af8b035fc8f62561c01a092327d96d12658.zip
Fixed #3672 - Error message on duplicate fileserver mounts incorrect
-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