diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-08 19:05:56 +0200 |
| commit | dd2d3ed2d30b5d705f9ed8695ab3171c29469f76 (patch) | |
| tree | 22e909cfe9de99fab471621a907b9f87045bb3bd /guix/tests/gnupg.scm | |
| parent | 24b61fb8ea8a9e8c5320d1db1447f9b62ad04b3d (diff) | |
| parent | 1fd2c00efbe701a81d86c254d5f4f285e63c1cde (diff) | |
| download | guix-patches-dd2d3ed2d30b5d705f9ed8695ab3171c29469f76.tar guix-patches-dd2d3ed2d30b5d705f9ed8695ab3171c29469f76.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/tests/gnupg.scm')
| -rw-r--r-- | guix/tests/gnupg.scm | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm index 6e7fdbcf65..47c858d232 100644 --- a/guix/tests/gnupg.scm +++ b/guix/tests/gnupg.scm @@ -22,27 +22,7 @@ #:use-module (ice-9 match) #:export (gpg-command gpgconf-command - with-fresh-gnupg-setup - - with-environment-variables)) - -(define (call-with-environment-variables variables thunk) - "Call THUNK with the environment VARIABLES set." - (let ((environment (environ))) - (dynamic-wind - (lambda () - (for-each (match-lambda - ((variable value) - (setenv variable value))) - variables)) - thunk - (lambda () - (environ environment))))) - -(define-syntax-rule (with-environment-variables variables exp ...) - "Evaluate EXP with the given environment VARIABLES set." - (call-with-environment-variables variables - (lambda () exp ...))) + with-fresh-gnupg-setup)) (define gpg-command (make-parameter "gpg")) |