diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-09-28 23:56:41 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-09-28 23:56:41 +0100 |
| commit | 15b94238c58c0da42d6e534040e79b0e111178bd (patch) | |
| tree | 198c41c001d904b98bf3425ce92c466668b7008d | |
| parent | 16ed3e376eccfdf3bca2bfca382b735fcf4b72c2 (diff) | |
| download | data-service-15b94238c58c0da42d6e534040e79b0e111178bd.tar data-service-15b94238c58c0da42d6e534040e79b0e111178bd.tar.gz | |
Unset the GUILE_LOAD_* environment variables when using inferiors
Otherwise modules from outside of the inferior can leak in.
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 349a86e..6d99862 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -736,6 +736,15 @@ WHERE job_id = $1" (glibc-locales-for-guix-store-path store store-path) "/lib/locale" ":" guix-locpath))) + ;; Unset the GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH to + ;; avoid the values for these being used in the + ;; inferior. Even though the inferior %load-path and + ;; %load-compiled-path has the inferior modules first, this + ;; can cause issues when there are modules present outside + ;; of the inferior Guix which aren't present in the inferior + ;; Guix (like the new (guix lint) module + (unsetenv "GUILE_LOAD_PATH") + (unsetenv "GUILE_LOAD_COMPILED_PATH") ;; Augment the GUIX_LOCPATH to include glibc-locales from ;; the Guix at store-path, this should mean that the ;; inferior Guix works, even if it's build using a different |