From patchwork Fri Apr 19 14:04:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 8360 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 6DEC816ECD; Fri, 19 Apr 2019 15:11:12 +0100 (BST) 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,UNPARSEABLE_RELAY autolearn=ham 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 1153B16EC9 for ; Fri, 19 Apr 2019 15:11:12 +0100 (BST) Received: from localhost ([127.0.0.1]:57103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHUER-0001Lo-KM for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 10:11:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHU8b-0004aq-Qq for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHU8a-0005x0-CY for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHU8X-0005oT-Cv for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHU8X-0002SP-6b for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34638] [PATCH v2 1/4] utils: Add #:base-directory to call-with-temporary-directory. References: <875zt9go87.fsf@cbaines.net> In-Reply-To: <875zt9go87.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2019 14:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34638@debbugs.gnu.org Received: via spool by 34638-submit@debbugs.gnu.org id=B34638.15556826729380 (code B ref 34638); Fri, 19 Apr 2019 14:05:05 +0000 Received: (at 34638) by debbugs.gnu.org; 19 Apr 2019 14:04:32 +0000 Received: from localhost ([127.0.0.1]:44418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7z-0002R8-R6 for submit@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:32 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7x-0002QW-0b for 34638@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:30 -0400 Received: from localhost (71.38.6.51.dyn.plus.net [51.6.38.71]) by mira.cbaines.net (Postfix) with ESMTPSA id 5FE7A16ECF for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 15:04:27 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d0bf4640 for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 14:04:27 +0000 (UTC) From: Christopher Baines Date: Fri, 19 Apr 2019 15:04:24 +0100 Message-Id: <20190419140427.15183-1-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 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 This allows more easily creating temporary directories within a specific directory. This is motivated by using this in inferior-eval-with-store. * guix/utils.scm (call-with-temporary-directory): Add optional keyword argument, base-directory. --- guix/utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index ed1a418cca..abeb156f40 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -620,10 +620,10 @@ call." (false-if-exception (close out)) (false-if-exception (delete-file template)))))) -(define (call-with-temporary-directory proc) +(define* (call-with-temporary-directory proc #:key base-directory) "Call PROC with a name of a temporary directory; close the directory and delete it when leaving the dynamic extent of this call." - (let* ((directory (or (getenv "TMPDIR") "/tmp")) + (let* ((directory (or base-directory (getenv "TMPDIR") "/tmp")) (template (string-append directory "/guix-directory.XXXXXX")) (tmp-dir (mkdtemp! template))) (dynamic-wind