ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: container: Fix call-with-clean-exit.

Browse source 
Before, call-with-clean-exit would *always* return an exit code of 1.

* gnu/build/linux-container.scm (call-with-clean-exit): Exit with status
  code of 0 if thunk does not throw an exception.
* tests/containers.scm: Add test.
This commit is contained in:
David Thompson 2015-10-09 12:33:40 -04:00
parent f5a21dc4cf
commit a72ccbc251
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/build/linux-container.scm
View file

@ -36,7 +36,9 @@ (define (call-with-clean-exit thunk)
"Apply THUNK, but exit with a status code of 1 if it fails." "Apply THUNK, but exit with a status code of 1 if it fails."
(dynamic-wind (dynamic-wind
(const #t) (const #t)
thunk (lambda ()
(thunk)
(primitive-exit 0))
(lambda () (lambda ()
(primitive-exit 1)))) (primitive-exit 1))))

4
tests/containers.scm
View file

@ -34,6 +34,10 @@ (define (assert-exit x)
(test-begin "containers") (test-begin "containers")
(test-assert "call-with-container, exit with 0 when there is no error"
(zero?
(call-with-container '() (const #t) #:namespaces '(user))))
(test-assert "call-with-container, user namespace" (test-assert "call-with-container, user namespace"
(zero? (zero?
(call-with-container '() (call-with-container '()