Permalink
Browse files

Merge pull request #236 from carsomyr/remove_redundant

Remove redundant constructs
  • Loading branch information...
2 parents e82de1c + ea155dd commit eae455ed727666dbaa5e57bbe32702c3858f29a6 @carsomyr carsomyr committed Jul 25, 2012
Showing with 2 additions and 3 deletions.
  1. +2 −3 lib/capistrano/configuration/execution.rb
View
5 lib/capistrano/configuration/execution.rb
@@ -59,7 +59,7 @@ def transaction
rollback!
raise
ensure
- self.rollback_requests = nil if Thread.main == Thread.current
+ self.rollback_requests = nil
end
end
@@ -108,8 +108,7 @@ def find_and_execute_task(path, hooks={})
def rollback!
return if Thread.current[:rollback_requests].nil?
- Thread.current[:rolled_back] = true
-
+
# throw the task back on the stack so that roles are properly
# interpreted in the scope of the task in question.
rollback_requests.reverse.each do |frame|

0 comments on commit eae455e

Please sign in to comment.