From 82e64fc14eec9f01f5fee12782046496ebed9c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 21 Nov 2015 22:24:45 +0100 Subject: environment: Correctly handle abnormal exits. Fixes . * guix/scripts/environment.scm (status->exit-code): New procedure. (exit/status, primitive-exit/status): Use it. * tests/guix-environment-container.sh: Add test. --- guix/scripts/environment.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'guix/scripts/environment.scm') diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 97410f4e09..fae261733e 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -317,8 +317,15 @@ requisite store items i.e. the union closure of all the inputs." (map input->requisites inputs)))) (return (delete-duplicates (concatenate reqs))))) -(define exit/status (compose exit status:exit-val)) -(define primitive-exit/status (compose primitive-exit status:exit-val)) +(define (status->exit-code status) + "Compute the exit code made from STATUS, a value as returned by 'waitpid', +and suitable for 'exit'." + ;; See . + (or (status:exit-val status) + (logior #x80 (status:term-sig status)))) + +(define exit/status (compose exit status->exit-code)) +(define primitive-exit/status (compose primitive-exit status->exit-code)) (define (launch-environment command inputs paths pure?) "Run COMMAND in a new environment containing INPUTS, using the native search -- cgit v1.2.3