summaryrefslogtreecommitdiffstats
path: root/lib/puppet/server/fileserver.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/server/fileserver.rb')
-rwxr-xr-xlib/puppet/server/fileserver.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index d25185476..4deeea46c 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -182,14 +182,17 @@ class Server
return if @noreadconfig
if @configstamp and FileTest.exists?(@config)
- if @configtimeout and @configstatted and
- (Time.now - @configstatted > @configtimeout)
+ if @configtimeout and @configstatted
+ if Time.now - @configstatted > @configtimeout
@configstatted = Time.now
tmp = File.stat(@config).ctime
if tmp == @configstamp
return
end
+ else
+ return
+ end
end
end