From patchwork Sun Feb 24 16:18:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 1232 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 13C5E16C96; Sun, 24 Feb 2019 16:20: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,UNPARSEABLE_RELAY 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 AF41416C20 for ; Sun, 24 Feb 2019 16:20:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:53044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxwVd-0002OV-0p for patchwork@mira.cbaines.net; Sun, 24 Feb 2019 11:20:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxwVX-0002O8-9k for guix-patches@gnu.org; Sun, 24 Feb 2019 11:20:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxwVW-0005ir-Bg for guix-patches@gnu.org; Sun, 24 Feb 2019 11:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36845) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxwVW-0005iP-6E for guix-patches@gnu.org; Sun, 24 Feb 2019 11:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxwVV-0003Ft-Te for guix-patches@gnu.org; Sun, 24 Feb 2019 11:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34638] [PATCH 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: Sun, 24 Feb 2019 16:20:01 +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.155102514112404 (code B ref 34638); Sun, 24 Feb 2019 16:20:01 +0000 Received: (at 34638) by debbugs.gnu.org; 24 Feb 2019 16:19:01 +0000 Received: from localhost ([127.0.0.1]:50383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxwUX-0003Dt-0u for submit@debbugs.gnu.org; Sun, 24 Feb 2019 11:19:01 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:52268 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxwUU-0003DU-Qd for 34638@debbugs.gnu.org; Sun, 24 Feb 2019 11:18:59 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 88ADB16C20 for <34638@debbugs.gnu.org>; Sun, 24 Feb 2019 16:18:56 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id bddd0a77 for <34638@debbugs.gnu.org>; Sun, 24 Feb 2019 16:18:55 +0000 (UTC) From: Christopher Baines Date: Sun, 24 Feb 2019 16:18:52 +0000 Message-Id: <20190224161855.2632-1-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 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