diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-01 17:34:45 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-01 17:34:45 -0800 |
| commit | 616986da3751012cf526ad75fd250abc93e6c52a (patch) | |
| tree | 410384b1046d6756949f544b1ab8c3d6e31ad8e6 /lib/puppet | |
| parent | af6e08c0a59db951502d0cf8c0ca24f5001e92f1 (diff) | |
| parent | b27e9b4bd79c30c7910a02122069695044f05477 (diff) | |
| download | puppet-616986da3751012cf526ad75fd250abc93e6c52a.tar.gz puppet-616986da3751012cf526ad75fd250abc93e6c52a.tar.xz puppet-616986da3751012cf526ad75fd250abc93e6c52a.zip | |
Merge branch 'ticket/2.6.next/5081' into 2.6.next
* ticket/2.6.next/5081:
[#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading site.pp"
Diffstat (limited to 'lib/puppet')
| -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 |