From patchwork Tue Apr 9 10:06:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 62879 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 0DA3727BBE9; Tue, 9 Apr 2024 11:08:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 431C227BBE2 for ; Tue, 9 Apr 2024 11:08:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ru8OV-00069r-Rj; Tue, 09 Apr 2024 06:07:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ru8OT-00069Q-09 for guix-patches@gnu.org; Tue, 09 Apr 2024 06:07:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru8OS-0002uH-L7 for guix-patches@gnu.org; Tue, 09 Apr 2024 06:07:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ru8Oa-0008Ku-CL for guix-patches@gnu.org; Tue, 09 Apr 2024 06:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70303] [PATCH 1/2] graft: Remove work-around for old guile. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Apr 2024 10:08:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70303 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70303@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 70303-submit@debbugs.gnu.org id=B70303.171265724531686 (code B ref 70303); Tue, 09 Apr 2024 10:08:04 +0000 Received: (at 70303) by debbugs.gnu.org; 9 Apr 2024 10:07:25 +0000 Received: from localhost ([127.0.0.1]:48332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8Nv-0008Ec-Cs for submit@debbugs.gnu.org; Tue, 09 Apr 2024 06:07:25 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8Nt-0008DV-2U for 70303@debbugs.gnu.org; Tue, 09 Apr 2024 06:07:22 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-41663330f9dso13828255e9.2 for <70303@debbugs.gnu.org>; Tue, 09 Apr 2024 03:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712657227; x=1713262027; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=iYeo193M09XZw9GmqZfnDBoHwx8WW3qktRYAh8/kTlA=; b=EIzEJLy3V4FzxsTrVzf83vbzPJfQ8nvigxkwld97RYyRIWSuaVaVJ1bJBNGHhoIbUu 8D0tAo3Umv95rBYzKrwgrEEeorE7y4VNxsQZn40eHw95RJ9yKPPkSD9eJ08YO51ELyMx LBQGohmUApEX1U7IrMY1fQ3y9h4wnvZkY1/WXlsUAnV9E1hiiWLuajFo4qz5RqgVwDJL /Ugw5244fZU+fbRe0asvbg1kAFCE+AS8N/YbutuHw0g+fBnhlVwRIEcihQcbKq8xH/G3 H1/TLrwXUs4rqGdN7Ffthi9zmQi6kjuaE9Ji2xoEivHGqS9UKV/VmYAiJx6B4rb37Mt6 u11A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712657227; x=1713262027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iYeo193M09XZw9GmqZfnDBoHwx8WW3qktRYAh8/kTlA=; b=XRjalShi5eMcexfYDu5a4baRt1x8karYm7ElztuA55HGCejjmtFRhPY83KfZPTJyzV YJhhgbmNg/F6DZnikA137dQWtxnjMh35/FezCWI6cxoHJQUpTZlF72uxbHpb/MMKBzw0 20SBcTQKiqwNYf9mFZ3byT3Ha+GSV/FewwwUMwPKCo7/UIwQFlA1nOXU2DC02vmxJNGs a/sJJsPuYVveSTl/TonIhyGuP1ePSulEtUH8v0Wm8qv0rElTcPPGNmtqr7H2sEV6AjYI 5EKM6/QJa3Cr0UFkFDegg0AiZIe7GyNUSUbtsOKQ4T3iskihY/Vqx2iy9j6/7s/vvPk/ 6fGg== X-Gm-Message-State: AOJu0YwX6PWF6iVCXgKrfsk4EaXEwRW58ih8aEjoqZ/7FBQlTlDULkEJ vNXuRH/DaX8taYOwhfJJVZOx5Yds78D8gvuvkkW92qDsBPsugx8dkLXjZhFzNHg= X-Google-Smtp-Source: AGHT+IHpjKRnPV2eI7HZfpSjSVxhx8JJNlKn/40L+C49Pj8y13GT47OVs0yb7POmKnr6X18GoFFJLQ== X-Received: by 2002:a05:600c:5253:b0:416:7396:6b14 with SMTP id fc19-20020a05600c525300b0041673966b14mr2980476wmb.5.1712657226717; Tue, 09 Apr 2024 03:07:06 -0700 (PDT) Received: from localhost ([141.226.11.200]) by smtp.gmail.com with ESMTPSA id o13-20020a5d58cd000000b00341b7d5054bsm11133842wrf.72.2024.04.09.03.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 03:07:06 -0700 (PDT) From: Efraim Flashner Date: Tue, 9 Apr 2024 13:06:55 +0300 Message-ID: <3d8f8f3135f69cc88a7d0575ce533d489239ede8.1712656502.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/graft.scm (mkdir-p*): Remove function. (rewrite-directory): Switch from mkdir-p* to mkdir-p. Change-Id: Ib6a80648d271c19093c05af84acb967e069ccc19 --- guix/build/graft.scm | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/guix/build/graft.scm b/guix/build/graft.scm index 281dbaba6f..c8c7e33ab2 100644 --- a/guix/build/graft.scm +++ b/guix/build/graft.scm @@ -312,33 +312,6 @@ (define (exit-on-exception proc) (print-exception port #f key args) (primitive-exit 1)))))) -;; We need this as long as we support Guile < 2.0.13. -(define* (mkdir-p* dir #:optional (mode #o755)) - "This is a variant of 'mkdir-p' that works around - by passing MODE explicitly in each 'mkdir' call." - (define absolute? - (string-prefix? "/" dir)) - - (define not-slash - (char-set-complement (char-set #\/))) - - (let loop ((components (string-tokenize dir not-slash)) - (root (if absolute? - "" - "."))) - (match components - ((head tail ...) - (let ((path (string-append root "/" head))) - (catch 'system-error - (lambda () - (mkdir path mode) - (loop tail path)) - (lambda args - (if (= EEXIST (system-error-errno args)) - (loop tail path) - (apply throw args)))))) - (() #t)))) - (define* (rewrite-directory directory output mapping #:optional (store (%store-directory))) "Copy DIRECTORY to OUTPUT, replacing strings according to MAPPING, a list of @@ -387,7 +360,7 @@ (define* (rewrite-directory directory output mapping (define (rewrite-leaf file) (let ((stat (lstat file)) (dest (destination file))) - (mkdir-p* (dirname dest)) + (mkdir-p (dirname dest)) (case (stat:type stat) ((symlink) (let ((target (readlink file))) @@ -406,7 +379,7 @@ (define* (rewrite-directory directory output mapping store) (chmod output (stat:perms stat))))))) ((directory) - (mkdir-p* dest)) + (mkdir-p dest)) (else (error "unsupported file type" stat)))))