Fixing info around newtype options

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

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index bcf240dfb..fd94424c0 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -377,8 +377,8 @@ module Puppet
     end
 
     # Create a new type.  Just proxy to the Type class.
-    def self.newtype(name, parent = nil, &block)
-        Puppet::Type.newtype(name, parent, &block)
+    def self.newtype(name, options = {}, &block)
+        Puppet::Type.newtype(name, options, &block)
     end
 
     # Retrieve a type by name.  Just proxy to the Type class.
diff --git a/lib/puppet/metatype/manager.rb b/lib/puppet/metatype/manager.rb
index ee396389b..172d3f6d4 100644
--- a/lib/puppet/metatype/manager.rb
+++ b/lib/puppet/metatype/manager.rb
@@ -57,7 +57,7 @@ module Manager
     def newtype(name, options = {}, &block)
         # Handle backward compatibility
         unless options.is_a?(Hash)
-            Puppet.warning "Puppet::Type.newtype now accepts a hash as the second argument"
+            Puppet.warning "Puppet::Type.newtype(%s) now expects a hash as the second argument, not %s" % [name, options.inspect]
             options = {:parent => options}
         end