summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-04-14 11:31:52 -0700
committerNick Lewis <nick@puppetlabs.com>2011-04-14 11:31:52 -0700
commitba9bd88b8b60ebe567a6d78d70782610cc281213 (patch)
tree0150d9c162a341dcfe6081c9fbdcb24b7fe3de6c
parentc7ae6bde57fd3ab8380cd5804fd87283bb708755 (diff)
parente119739de80a2a09593dbc69aee6049b723d4e06 (diff)
downloadpuppet-ba9bd88b8b60ebe567a6d78d70782610cc281213.tar.gz
puppet-ba9bd88b8b60ebe567a6d78d70782610cc281213.tar.xz
puppet-ba9bd88b8b60ebe567a6d78d70782610cc281213.zip
Merge branch 'ticket/next/6928' into next
-rw-r--r--lib/puppet/face/parser.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/face/parser.rb b/lib/puppet/face/parser.rb
index c44810b99..d4aaaf043 100644
--- a/lib/puppet/face/parser.rb
+++ b/lib/puppet/face/parser.rb
@@ -6,7 +6,10 @@ Puppet::Face.define(:parser, '0.0.1') do
when_invoked do |*args|
args.pop
files = args
- files << Puppet[:manifest] if files.empty?
+ if files.empty?
+ files << Puppet[:manifest]
+ Puppet.notice "No manifest specified. Validating the default manifest #{Puppet[:manifest]}"
+ end
files.each do |file|
Puppet[:manifest] = file
Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types.clear