adding a bit better error reporting when tags are bad

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1993 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb
index 8b7df8c78..035f944a9 100644
--- a/lib/puppet/parser/collector.rb
+++ b/lib/puppet/parser/collector.rb
@@ -26,6 +26,8 @@ class Puppet::Parser::Collector
             #Puppet.info "Host %s is uninitialized" % @scope.host
         end
 
+        p args
+
         # Now look them up in the rails db.  When we support attribute comparison
         # and such, we'll need to vary the conditions, but this works with no
         # attributes, anyway.
@@ -33,6 +35,7 @@ class Puppet::Parser::Collector
             Puppet::Rails::Resource.find_all_by_restype_and_exported(@type, true,
                 args
             ).each do |obj|
+                p obj
                 if resource = export_resource(obj)
                     count += 1
                     resources << resource
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index 23542b6c9..1f672d15b 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -520,7 +520,7 @@ class Puppet::Parser::Scope
     def tag(*ary)
         ary.each { |tag|
             unless tag =~ /^\w[-\w]+$/
-                fail Puppet::ParseError, "Invalid tag %s" % tag
+                fail Puppet::ParseError, "Invalid tag %s" % tag.inspect
             end
             if tag.nil? or tag == ""
                 puts caller