[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit d20d5de05b855a95eb92e5caa603634d5d082671
Author: James Turnbull <james at lovedthanlost.net>
Date:   Tue Apr 27 13:53:20 2010 +1000

    Fixed #3672 - Error message on duplicate fileserver mounts incorrect

diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index 7049fb0..bed232f 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

-- 
Puppet packaging for Debian