From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41472) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilJvL-0005nE-Tm for guix-patches@gnu.org; Sat, 28 Dec 2019 16:47:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ilJvL-0004Fz-01 for guix-patches@gnu.org; Sat, 28 Dec 2019 16:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53054) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ilJvK-000486-Re for guix-patches@gnu.org; Sat, 28 Dec 2019 16:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ilJvJ-0003VU-Py for guix-patches@gnu.org; Sat, 28 Dec 2019 16:47:01 -0500 Subject: [bug#38781] [PATCH core-updates] build-system/gnu: Make 'first-subdirectory' optional. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:39503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilJul-0005bP-5I for guix-patches@gnu.org; Sat, 28 Dec 2019 16:46:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ilJuk-0000To-18 for guix-patches@gnu.org; Sat, 28 Dec 2019 16:46:26 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:46988) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ilJuj-0000FM-Po for guix-patches@gnu.org; Sat, 28 Dec 2019 16:46:25 -0500 From: Danny Milosavljevic Date: Sat, 28 Dec 2019 22:46:22 +0100 Message-Id: <20191228214622.4061-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38781@debbugs.gnu.org Cc: Danny Milosavljevic * guix/build/gnu-build-system.scm (unpack): Make 'first-subdirectory' optional. --- guix/build/gnu-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-syste= m.scm index 4df0bb4904..4ebaa455b0 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -160,7 +160,7 @@ working directory." (if (string-suffix? ".zip" source) (invoke "unzip" source) (invoke "tar" "xvf" source)) - (chdir (first-subdirectory ".")))) + (chdir (or (first-subdirectory ".") ".")))) #t) =20 (define %bootstrap-scripts