summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-06 21:19:34 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-06 21:19:34 +0000
commit54fcdbdbf7781153429fe55de6576b6bcf06a9a1 (patch)
treed255776fe401baec78b34d1de632eb1c574bc6ab /lib/puppet/parser
parent0549d0393be2822359aa2392fabae1d7b23bca25 (diff)
downloadpuppet-54fcdbdbf7781153429fe55de6576b6bcf06a9a1.tar.gz
puppet-54fcdbdbf7781153429fe55de6576b6bcf06a9a1.tar.xz
puppet-54fcdbdbf7781153429fe55de6576b6bcf06a9a1.zip
fixing some more logging issues
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@989 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/ast/objectdef.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/puppet/parser/ast/objectdef.rb b/lib/puppet/parser/ast/objectdef.rb
index 59758b982..7b7bf6648 100644
--- a/lib/puppet/parser/ast/objectdef.rb
+++ b/lib/puppet/parser/ast/objectdef.rb
@@ -192,7 +192,7 @@ class Puppet::Parser::AST
unless type.validattr?(pname)
error = Puppet::ParseError.new(
"Invalid parameter '%s' for type '%s'" %
- [pname,type.name]
+ [pname,type.type]
)
error.line = self.line
error.file = self.file
@@ -213,12 +213,10 @@ class Puppet::Parser::AST
raise Puppet::DevError, detail.to_s
end
- # FIXME This should look through the scope tree, not in a global
- # hash
unless objtype.validarg?(pname)
error = Puppet::ParseError.new(
"Invalid parameter '%s' for type '%s'" %
- [pname,objtype]
+ [pname,objtype.type]
)
error.line = self.line
error.file = self.file