reset original directory in ensure

a1759666 · Alexis Reigel · 2c17853a · a1759666
Commit a1759666 authored Aug 14, 2017 by Alexis Reigel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

lib/gitlab/gpg.rb lib/gitlab/gpg.rb +4 -8

No files found.
--- a/lib/gitlab/gpg.rb
+++ b/lib/gitlab/gpg.rb
@@ -68,17 +68,13 @@ module Gitlab
    private
    def optimistic_using_tmp_keychain
+      previous_dir = current_home_dir
      Dir.mktmpdir do |dir|
-        previous_dir = current_home_dir
        GPGME::Engine.home_dir = dir
+        yield
-        return_value = yield
-        GPGME::Engine.home_dir = previous_dir
-        return_value
      end
+    ensure
+      GPGME::Engine.home_dir = previous_dir
    end
  end
 end