diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-18 19:54:16 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-18 19:54:16 +0000 |
| commit | e3b4f234a39f264b488c80fd526fe820a09fc16c (patch) | |
| tree | 645bf43d3182457c2db7ad5a7cfa5984db81c397 /lib/puppet/server/fileserver.rb | |
| parent | 07f616badf4e067000fa5d49c2698b8b6b5a7609 (diff) | |
| download | puppet-e3b4f234a39f264b488c80fd526fe820a09fc16c.tar.gz puppet-e3b4f234a39f264b488c80fd526fe820a09fc16c.tar.xz puppet-e3b4f234a39f264b488c80fd526fe820a09fc16c.zip | |
Another round of bugfixing, including finding out that the tagmail report was leaving zombie processes lying around
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1816 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server/fileserver.rb')
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index 85f0f5016..8033fac5b 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -245,7 +245,7 @@ class Server name = $1 if newmounts.include?(name) raise FileServerError, "%s is already mounted at %s" % - [newmounts[name], name] + [newmounts[name], name], count, @config.file end mount = Mount.new(name) newmounts[name] = mount @@ -267,8 +267,8 @@ class Server mount.info "allowing %s access" % val mount.allow(val) rescue AuthStoreError => detail - raise FileServerError, "%s at line %s of %s" % - [detail.to_s, count, @config] + raise FileServerError.new(detail.to_s, + count, @config.file) end } when "deny": @@ -277,16 +277,17 @@ class Server mount.info "denying %s access" % val mount.deny(val) rescue AuthStoreError => detail - raise FileServerError, "%s at line %s of %s" % - [detail.to_s, count, @config] + raise FileServerError.new(detail.to_s, + count, @config.file) end } else - raise FileServerError, - "Invalid argument '%s' at line %s" % [var, count] + raise FileServerError.new("Invalid argument '%s'" % var, + count, @config.file) end else - raise FileServerError, "Invalid line %s: %s" % [count, line] + raise FileServerError.new("Invalid line '%s'" % line.chomp, + count, @config.file) end count += 1 } |