summaryrefslogtreecommitdiffstats
path: root/lib/puppet/server/fileserver.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-06 21:19:34 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-06 21:19:34 +0000
commit54fcdbdbf7781153429fe55de6576b6bcf06a9a1 (patch)
treed255776fe401baec78b34d1de632eb1c574bc6ab /lib/puppet/server/fileserver.rb
parent0549d0393be2822359aa2392fabae1d7b23bca25 (diff)
downloadpuppet-54fcdbdbf7781153429fe55de6576b6bcf06a9a1.tar.gz
puppet-54fcdbdbf7781153429fe55de6576b6bcf06a9a1.tar.xz
puppet-54fcdbdbf7781153429fe55de6576b6bcf06a9a1.zip
fixing some more logging issues
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@989 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server/fileserver.rb')
-rwxr-xr-xlib/puppet/server/fileserver.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index 24bd50ec3..c0d1303fa 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -503,7 +503,13 @@ class Server
def fileobj(path, links)
obj = nil
- unless obj = Puppet.type(:file)[path]
+ if obj = Puppet.type(:file)[path]
+ # This can only happen in local fileserving, but it's an
+ # important one. It'd be nice if we didn't just set
+ # the check params every time, but I'm not sure it's worth
+ # the effort.
+ obj[:check] = CHECKPARAMS
+ else
obj = Puppet.type(:file).create(
:name => path,
:check => CHECKPARAMS