From patchwork Wed Apr 26 19:03:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 49555 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 38BA627BBE9; Wed, 26 Apr 2023 20:04:57 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 03F0B27BBE2 for ; Wed, 26 Apr 2023 20:04:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prkQu-00076m-5p; Wed, 26 Apr 2023 15:04:04 -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 1prkQs-00076E-QF for guix-patches@gnu.org; Wed, 26 Apr 2023 15:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prkQs-0001qN-Hz for guix-patches@gnu.org; Wed, 26 Apr 2023 15:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prkQs-0005V9-Cx for guix-patches@gnu.org; Wed, 26 Apr 2023 15:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63092] [PATCH v3 2/2] gnu: git-minimal: Check files exist before delete. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2023 19:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63092 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63092@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 63092-submit@debbugs.gnu.org id=B63092.168253583921124 (code B ref 63092); Wed, 26 Apr 2023 19:04:02 +0000 Received: (at 63092) by debbugs.gnu.org; 26 Apr 2023 19:03:59 +0000 Received: from localhost ([127.0.0.1]:57020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prkQo-0005UY-Oq for submit@debbugs.gnu.org; Wed, 26 Apr 2023 15:03:59 -0400 Received: from mail-yb1-f172.google.com ([209.85.219.172]:58623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prkQl-0005U4-Vd for 63092@debbugs.gnu.org; Wed, 26 Apr 2023 15:03:57 -0400 Received: by mail-yb1-f172.google.com with SMTP id 3f1490d57ef6-b8f557b241fso5896911276.0 for <63092@debbugs.gnu.org>; Wed, 26 Apr 2023 12:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1682535830; x=1685127830; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mGGZH+Q8h5AbnCd6J89M+ne9wIcABb6G8YxwDHnsvs0=; b=zUMb9dFdzg1fCmMK4IqLSMn0BA5HxqM2cLLLjm/7yc2guvyv1ZG5N2ZIMf+AYDrqc4 duOAehcMNJVMrIcDZJyyahGCE5X4vlyanjXjvXwiqAB/L9Lp7R+825zTsWgh5P7Kjfjq MUdrWUe43ofqnaDLr9nLt0s/lhHs7vmDYv2tpwK8qFp2yTOgXsCFvzeA5DdPyX+u40M2 tKxo6xFF7ufOW3rJd6hEu1NrsykZ/4m0EkNhK0IbZR8GMxweUJ58WTGnpWigciht+45T UgBfoEJYJqv3qOBdaFtYuUaZsg4EJ/j4Ni7nYC4LX2kP2IPCwag1t6aArLyh03GdWFJo KCow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682535830; x=1685127830; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mGGZH+Q8h5AbnCd6J89M+ne9wIcABb6G8YxwDHnsvs0=; b=E3m7bIwdpgb+hQtQZn2BqgIWja+dmDwPnOGoirKwh4oM12yHCt5iCVbJchHkLLR+sp p4Tw+Qh+b3KxH/3eFE3IBLcP9Wem6mOIRq2s0Hxcj0tdDV9UROlbXVVQqgdAV2wZQhRl eEuVOpJTG2AdN0u85nQtT+j9OYXJXFDiaffclagxllWUPKk8DJbMmFOX4HOENd4JeeJh QAfc6Zugxe5THiWsWX22Z+bB5rNjwhz88QymCzY9u18ubnECnVBf8pCkLP1/l4fIR1dL Ew5iNOkPeYnL3jFtjoTE/K/Hb6GNf3EGADaxeKSxq+4R/c/wnwdYN+QobjmsucbW79ii nHqg== X-Gm-Message-State: AAQBX9e4ERQN6i8gMAIioWcskJ0ZRwEaSF1EzSOSVr4bBiSR4lMUcmrc L4bN+KVxQshUiUeDgVOXB2yCxmXpwehh/pXPA8w= X-Google-Smtp-Source: AKy350YT+nNQdd0oC1ZCkZIQimgt2LhPjRMKEZkNSolEx6C3k8rPhK6KaIiBbR/CFjWQcglT17qrLQ== X-Received: by 2002:a25:5857:0:b0:b99:749b:29f6 with SMTP id m84-20020a255857000000b00b99749b29f6mr8679803ybb.50.1682535830378; Wed, 26 Apr 2023 12:03:50 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-219-13-189.us-east-2.compute.amazonaws.com. [18.219.13.189]) by smtp.gmail.com with ESMTPSA id o132-20020a25d78a000000b00b8f2d726471sm4192596ybg.3.2023.04.26.12.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 12:03:50 -0700 (PDT) From: Greg Hogan Date: Wed, 26 Apr 2023 19:03:46 +0000 Message-Id: <20230426190346.3457310-3-code@greghogan.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426190346.3457310-1-code@greghogan.com> References: <20230426190346.3457310-1-code@greghogan.com> 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 * gnu/packages/version-control.scm (git-minimal) [arguments]<#:phases>(remove-unusable-perl-commands): Add file check before deleting perl scripts so that this phase works for both new and old, pinned versions. --- gnu/packages/version-control.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5f6766f510..0467e9f4cb 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -634,8 +634,11 @@ (define-public git-minimal (bin (string-append out "/bin")) (libexec (string-append out "/libexec"))) (for-each (lambda (file) - (delete-file (string-append libexec - "/git-core/" file))) + (if (file-exists? file) + (delete-file (string-append libexec + "/git-core/" file)))) + ;; git-add--interactive was removed in Git 2.40 but + ;; this phase is inherited by older versions. '("git-svn" "git-cvsimport" "git-archimport" "git-cvsserver" "git-request-pull" "git-add--interactive" "git-cvsexportcommit"