diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-01 17:16:03 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-01 17:16:03 -0800 |
| commit | b27e9b4bd79c30c7910a02122069695044f05477 (patch) | |
| tree | 410384b1046d6756949f544b1ab8c3d6e31ad8e6 /lib | |
| parent | af6e08c0a59db951502d0cf8c0ca24f5001e92f1 (diff) | |
[#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading site.pp"
The fix for #4349 caused --parse-only not to detect syntax errors when
--ignore-import was used by adding a return statement that bypassed the
initial import:
commit 760e418d254a8d2198d2c6eb466d783a5930ef47
def perform_initial_import
+ return if Puppet.settings[:ignoreimport]
The problem that #4349 fixed was more generally fixed in commit
99c1019e1d3402ec8e476dc859d5aaef82ec4f69 for ticket #4798 so the return
statement is no longer needed, so reverting the commit for #4349 does
not reintroduce the problem of an import loop error when running puppet
doc.
Paired-with: Jesse Wolfe
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/resource/type_collection.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/resource/type_collection.rb b/lib/puppet/resource/type_collection.rb index 63d110395..6a03458b3 100644 --- a/lib/puppet/resource/type_collection.rb +++ b/lib/puppet/resource/type_collection.rb @@ -153,7 +153,6 @@ class Puppet::Resource::TypeCollection end def perform_initial_import - return if Puppet.settings[:ignoreimport] parser = Puppet::Parser::Parser.new(environment) if code = Puppet.settings.uninterpolated_value(:code, environment.to_s) and code != "" parser.string = code |