HomePhorge

[#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading…
b27e9b4bd79cUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

[#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

Details

Provenance
Matt Robinson <matt@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPUaf6e08c0a59d: (#5304) Use internal_name rather than real_name for maillist provider
Branches
Unknown
Tags
Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPUb27e9b4bd79c: [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading… (authored by Matt Robinson <matt@puppetlabs.com>).Dec 2 2010, 2:16 AM