diff options
Diffstat (limited to 'lib/puppet/parameter.rb')
| -rw-r--r-- | lib/puppet/parameter.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb index c068e8e11..54e71dd41 100644 --- a/lib/puppet/parameter.rb +++ b/lib/puppet/parameter.rb @@ -90,7 +90,7 @@ class Puppet::Parameter # Is this parameter the namevar? Defaults to false. def isnamevar? - defined?(@isnamevar) && @isnamevar + @isnamevar end # This parameter is required. @@ -105,7 +105,7 @@ class Puppet::Parameter # Is this parameter required? Defaults to false. def required? - defined?(@required) && @required + @required end # Verify that we got a good value @@ -164,9 +164,9 @@ class Puppet::Parameter error = type.new(args.join(" ")) - error.line = @resource.line if defined?(@resource) and @resource and @resource.line + error.line = @resource.line if @resource and @resource.line - error.file = @resource.file if defined?(@resource) and @resource and @resource.file + error.file = @resource.file if @resource and @resource.file raise error end @@ -212,7 +212,7 @@ class Puppet::Parameter # return the full path to us, for logging and rollback; not currently # used def pathbuilder - if defined?(@resource) and @resource + if @resource return [@resource.pathbuilder, self.name] else return [self.name] |