diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-13 16:27:35 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-13 16:27:35 -0600 |
| commit | 0cfa1d2b7ae38020d3b845d7713cb10cda7facef (patch) | |
| tree | fcfa2861cb0174ab610235a14c69909d094de4a8 /lib/puppet/parser/grammar.ra | |
| parent | 8367fdfab25aacb56f16444f5763b347e6a907ab (diff) | |
| download | puppet-0cfa1d2b7ae38020d3b845d7713cb10cda7facef.tar.gz puppet-0cfa1d2b7ae38020d3b845d7713cb10cda7facef.tar.xz puppet-0cfa1d2b7ae38020d3b845d7713cb10cda7facef.zip | |
Fixed #968 again, this time with tests -- parseonly works,
including not compiling the configurations, and also storeconfigs
is no longer required during parse-testing.
Diffstat (limited to 'lib/puppet/parser/grammar.ra')
| -rw-r--r-- | lib/puppet/parser/grammar.ra | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 0fd644b3a..484efe83c 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -151,7 +151,7 @@ resourceoverride: resourceref LBRACE anyparams endcomma RBRACE { virtualresource: at resource { type = val[0] - if type == :exported and ! Puppet[:storeconfigs] + if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly] error "You cannot collect without storeconfigs being set" end @@ -192,7 +192,7 @@ collection: classref collectrhand { else args[:form] = val[1] end - if args[:form] == :exported and ! Puppet[:storeconfigs] + if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly] error "You cannot collect exported resources without storeconfigs being set" end result = ast AST::Collection, args |