diff options
-rw-r--r-- | lib/gitlab/gpg.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/gitlab/gpg.rb b/lib/gitlab/gpg.rb index 78ebd8866a1..45e9f9d65ae 100644 --- 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 - - return_value = yield - - GPGME::Engine.home_dir = previous_dir - - return_value + yield end + ensure + GPGME::Engine.home_dir = previous_dir end end end |