diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 15:51:43 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 15:51:43 -0700 |
| commit | 02691637553d5637ee01a433a516b5d8cc9768a9 (patch) | |
| tree | 9465b1ed4dcb64f68e6137be5ea094e8d305f5e9 /lib/puppet/parser/parser.rb | |
| parent | 008770dba7946b67f252561fecd967c7fe67fd17 (diff) | |
| parent | 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07 (diff) | |
| download | puppet-02691637553d5637ee01a433a516b5d8cc9768a9.tar.gz puppet-02691637553d5637ee01a433a516b5d8cc9768a9.tar.xz puppet-02691637553d5637ee01a433a516b5d8cc9768a9.zip | |
Merge branch 'ticket/next/6928' into next
Diffstat (limited to 'lib/puppet/parser/parser.rb')
| -rw-r--r-- | lib/puppet/parser/parser.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index 300ddddd6..611398d14 100644 --- a/lib/puppet/parser/parser.rb +++ b/lib/puppet/parser/parser.rb @@ -1366,7 +1366,7 @@ module_eval(<<'.,.,', 'grammar.ra', 156) def _reduce_50(val, _values, result) type = val[0] - if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly] + if (type == :exported and ! Puppet[:storeconfigs]) Puppet.warning addcontext("You cannot collect without storeconfigs being set") end @@ -1411,7 +1411,7 @@ module_eval(<<'.,.,', 'grammar.ra', 178) else args[:form] = val[1] end - if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly] + if args[:form] == :exported and ! Puppet[:storeconfigs] Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored") end args[:override] = val[3] @@ -1436,7 +1436,7 @@ module_eval(<<'.,.,', 'grammar.ra', 197) else args[:form] = val[1] end - if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly] + if args[:form] == :exported and ! Puppet[:storeconfigs] Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored") end result = ast AST::Collection, args |