summaryrefslogtreecommitdiffstats
path: root/lib/puppet/server
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-18 19:21:53 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-18 19:21:53 +0000
commit16c9f834424ebb16eb9e8ce246576f05df653451 (patch)
tree36196e6f741512ec2c1add5a32419e2d1f080797 /lib/puppet/server
parent23d3c93d31d242e1b3f22ac381d5defca088d312 (diff)
My cfengine2puppet config now entirely parses. The biggest problem I ran into is that my glob-based parsing was only returning the results of the last parsed file, instead of collecting all of the results.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@689 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server')
-rw-r--r--lib/puppet/server/master.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb
index 5cc9d8793..099fe25c8 100644
--- a/lib/puppet/server/master.rb
+++ b/lib/puppet/server/master.rb
@@ -105,8 +105,11 @@ class Server
else
return
end
+ else
+ @filestatted = Time.now
end
end
+ @filestatted = Time.now
unless FileTest.exists?(@file)
if @ast