From patchwork Sat Dec 28 21:46:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 19463 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 40F0617984; Sat, 28 Dec 2019 21:47:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E89B11795E for ; Sat, 28 Dec 2019 21:47:09 +0000 (GMT) Received: from localhost ([::1]:46568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilJvR-0005nK-Al for patchwork@mira.cbaines.net; Sat, 28 Dec 2019 16:47:09 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#38781] [PATCH core-updates] build-system/gnu: Make 'first-subdirectory' optional. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2019 21:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38781 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38781@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157756959013442 (code B ref -1); Sat, 28 Dec 2019 21:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Dec 2019 21:46:30 +0000 Received: from localhost ([127.0.0.1]:59027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ilJuo-0003Uj-6U for submit@debbugs.gnu.org; Sat, 28 Dec 2019 16:46:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:45133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ilJum-0003Uc-CF for submit@debbugs.gnu.org; Sat, 28 Dec 2019 16:46:28 -0500 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 Received: from dayas.fritz.box (unknown [185.17.13.127]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 549493363FB1; Sat, 28 Dec 2019 22:46:23 +0100 (CET) From: Danny Milosavljevic Date: Sat, 28 Dec 2019 22:46:22 +0100 Message-Id: <20191228214622.4061-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Tags: patch X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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-system.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) (define %bootstrap-scripts