From 2520059bdb43fa1663ce102f3f4c442d4918c32b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Apr 2020 14:30:38 +0200 Subject: pack: 'guix pack -R' wrapper correctly reports exit code. Fixes . Reported by Jan (janneke) Nieuwenhuizen . * gnu/packages/aux-files/run-in-namespace.c (main): In the 'default' case, check 'WIFEXITED (status)' and exit with the corresponding code in that case. Exit with 255 in other cases. * tests/guix-pack-relocatable.sh: Add test. --- gnu/packages/aux-files/run-in-namespace.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/run-in-namespace.c b/gnu/packages/aux-files/run-in-namespace.c index 551f4db88a..160f7da1c8 100644 --- a/gnu/packages/aux-files/run-in-namespace.c +++ b/gnu/packages/aux-files/run-in-namespace.c @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2018, 2019 Ludovic Courtès + Copyright (C) 2018, 2019, 2020 Ludovic Courtès This file is part of GNU Guix. @@ -343,7 +343,13 @@ Please refer to the 'guix pack' documentation for more information.\n"); chdir ("/"); /* avoid EBUSY */ rm_rf (new_root); free (new_root); - exit (status); + + if (WIFEXITED (status)) + exit (WEXITSTATUS (status)); + else + /* Abnormal termination cannot really be reproduced, so exit + with 255. */ + exit (255); } } } -- cgit 1.4.1