[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

markus (none) markus at AVA-351181.
Mon Aug 16 12:48:53 UTC 2010


The following commit has been merged in the upstream branch:
commit 1dfd2b6ba30f7a4c06688e18d0d6cd73a2e45d91
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Tue Jul 27 10:53:19 2010 -0700

    [#4381] extlookup shouldn't trigger reparses of .pp files
    
    extlookup was adding its data files to the list of watched source files.
    This causes the .pp manifests to be re-parsed whenever the .csv files
    change, which is no longer necessary, as the .csv files are already
    reparsed on every function call.

diff --git a/lib/puppet/parser/functions/extlookup.rb b/lib/puppet/parser/functions/extlookup.rb
index 177d9ae..a4786f5 100644
--- a/lib/puppet/parser/functions/extlookup.rb
+++ b/lib/puppet/parser/functions/extlookup.rb
@@ -122,9 +122,6 @@ module Puppet::Parser::Functions
     desired = nil
 
     datafiles.each do |file|
-      parser = Puppet::Parser::Parser.new(environment)
-      parser.watch_file(file) if File.exists?(file)
-
       if desired.nil?
         if File.exists?(file)
           result = CSV.read(file).find_all do |r|

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list