diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-19 19:59:01 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-19 19:59:04 -0700 |
| commit | 2af27160b94efa4755187efd99c86d1659683b29 (patch) | |
| tree | e478abb994e64164061be7d6adc1f2c8147ec9eb /lib/puppet/parser/parser_support.rb | |
| parent | 21efa7b282080c69760a17576dff60c01821a963 (diff) | |
| parent | d87a2e39d1a6104c52b1213a654ec9d58d0bff7f (diff) | |
| download | puppet-2af27160b94efa4755187efd99c86d1659683b29.tar.gz puppet-2af27160b94efa4755187efd99c86d1659683b29.tar.xz puppet-2af27160b94efa4755187efd99c86d1659683b29.zip | |
Merge branch 'master' into next
This is the code for 2.6 RC4
Diffstat (limited to 'lib/puppet/parser/parser_support.rb')
| -rw-r--r-- | lib/puppet/parser/parser_support.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb index 4f3a4ddff..c0fd37178 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -111,7 +111,7 @@ class Puppet::Parser::Parser end def import(file) - known_resource_types.loader.import(file, @lexer.file) + known_resource_types.loader.import_if_possible(file, @lexer.file) end def initialize(env) |