diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-15 06:55:29 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-15 06:55:29 +0000 |
| commit | 26bf373eee9d5ac09296bd5eab3af11b44f28826 (patch) | |
| tree | 24c5ed21048253fe6db49faa9252f55229d173a7 /lib | |
| parent | e46d0072cf352c3555c45ab5d01e32615821de6a (diff) | |
| download | puppet-26bf373eee9d5ac09296bd5eab3af11b44f28826.tar.gz puppet-26bf373eee9d5ac09296bd5eab3af11b44f28826.tar.xz puppet-26bf373eee9d5ac09296bd5eab3af11b44f28826.zip | |
Applying patch in #160.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1608 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/type.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 9b68d9f5f..1f8af8e82 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -595,9 +595,9 @@ class Type < Puppet::Element # Create a new parameter. Requires a block and a name, stores it in the # @parameters array, and does some basic checking on it. - def self.newparam(name, &block) + def self.newparam(name, options = {}, &block) param = genclass(name, - :parent => Puppet::Parameter, + :parent => options[:parent] || Puppet::Parameter, :attributes => { :element => self }, :block => block, :prefix => "Parameter", |