summaryrefslogtreecommitdiff
path: root/lib/chef/resource.rb
diff options
context:
space:
mode:
authorAdam Jacob <adam@hjksolutions.com>2008-04-28 00:31:20 -0700
committerAdam Jacob <adam@hjksolutions.com>2008-04-28 00:31:20 -0700
commit21cc606e60acc25d8741757eacc2c5459cdd1472 (patch)
tree53319a768a0a9d9c5f06e715ab75597e422c372a /lib/chef/resource.rb
parentbab9b3459fe41849970e50cb9b96ea62370fbad0 (diff)
downloadchef-21cc606e60acc25d8741757eacc2c5459cdd1472.tar.gz
Got set_or_return to work properly
Diffstat (limited to 'lib/chef/resource.rb')
-rw-r--r--lib/chef/resource.rb15
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index 5a5263b321..afff713ba6 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -50,20 +50,11 @@ class Chef
end
def action(arg=nil)
- if arg != nil
- arg = arg.to_sym
- end
+ arg = arg.to_sym if arg
set_or_return(
- @action,
+ :action,
arg,
- {
- :action => arg,
- },
- {
- :action => {
- :equal_to => @allowed_actions,
- }
- }
+ :equal_to => @allowed_actions
)
end