Skip to content
This repository
Browse code

Merge pull request #236 from carsomyr/remove_redundant

Remove redundant constructs
  • Loading branch information...
commit d9b0437817938223d81d3bc733e6362fabf6c3da 2 parents e82de1c + ea155dd
Roy Liu authored July 25, 2012

Showing 1 changed file with 2 additions and 3 deletions. Show diff stats Hide diff stats

  1. 5  lib/capistrano/configuration/execution.rb
5  lib/capistrano/configuration/execution.rb
@@ -59,7 +59,7 @@ def transaction
59 59
           rollback!
60 60
           raise
61 61
         ensure
62  
-          self.rollback_requests = nil if Thread.main == Thread.current
  62
+          self.rollback_requests = nil
63 63
         end
64 64
       end
65 65
 
@@ -108,8 +108,7 @@ def find_and_execute_task(path, hooks={})
108 108
 
109 109
       def rollback!
110 110
         return if Thread.current[:rollback_requests].nil?
111  
-        Thread.current[:rolled_back] = true
112  
-   
  111
+
113 112
         # throw the task back on the stack so that roles are properly
114 113
         # interpreted in the scope of the task in question.
115 114
         rollback_requests.reverse.each do |frame|

0 notes on commit d9b0437

Please sign in to comment.
Something went wrong with that request. Please try again.