Fixes crayfishx#21: Restore GNUPGHOME environment variable after read…

…ing.
glennpratt · Feb 6, 2013 · b921127 · b921127
1 parent bf659b1
commit b921127
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/hiera/backend/gpg_backend.rb b/lib/hiera/backend/gpg_backend.rb
@@ -75,7 +75,8 @@ def lookup(key, scope, order_override, resolution_type)
 
         def decrypt(file, gnupghome)
 
-            ENV["GNUPGHOME"]=gnupghome
+            gnupghome_backup = ENV["GNUPGHOME"]
+            ENV["GNUPGHOME"] = gnupghome
             debug("GNUPGHOME is #{ENV['GNUPGHOME']}")
 
             ctx = GPGME::Ctx.new
@@ -95,6 +96,8 @@ def decrypt(file, gnupghome)
                             warn("Warning: GPG Decryption failed, check your GPG settings")
                         rescue
                             warn("Warning: General exception decrypting GPG file")
+                        ensure
+                            ENV["GNUPGHOME"] = gnupghome_backup
                         end
 
                         txt.seek 0