From patchwork Sun Feb 27 13:53:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 37522 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 1588827BBEA; Sun, 27 Feb 2022 14:07:24 +0000 (GMT) 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_H5,RCVD_IN_MSPIKE_WL, 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 B08CF27BBE9 for ; Sun, 27 Feb 2022 14:07:23 +0000 (GMT) Received: from localhost ([::1]:49172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOKCo-0000mT-SW for patchwork@mira.cbaines.net; Sun, 27 Feb 2022 09:07:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOK0u-0000Ss-8F for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOK0t-0001s4-8O for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOK0t-0004tq-6I for guix-patches@gnu.org; Sun, 27 Feb 2022 08:55:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' call. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 13:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54180@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 54180-submit@debbugs.gnu.org id=B54180.164597006118688 (code B ref 54180); Sun, 27 Feb 2022 13:55:03 +0000 Received: (at 54180) by debbugs.gnu.org; 27 Feb 2022 13:54:21 +0000 Received: from localhost ([127.0.0.1]:57162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOK0C-0004rD-SC for submit@debbugs.gnu.org; Sun, 27 Feb 2022 08:54:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOK0A-0004qE-PF for 54180@debbugs.gnu.org; Sun, 27 Feb 2022 08:54:18 -0500 Received: from [2001:470:142:3::e] (port=50238 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOJzw-0001ZW-2y; Sun, 27 Feb 2022 08:54:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Rs5aZkYJUNIiV3ppRvDlBrBglFTvqsHEr5Zil1ftbuM=; b=F+vA0bYgHtV7o0a0xwv1 CPJW8ljG3nFLzT+3nPV6sBzkyUmUqRYiupeyUUjrWNxfJKPsEh+kRmTCTCE5QHIh8zscxsaYYdkRo zZxAciFgKkQjbigWuPmw9fpz5rfR5dKkS5x2wZVgPiZMQmrJKnmoFhgLGlJGaSjd5hFygv2YFHmPz niek1toWqNNJZ7FVpxQcHOZhFhrw2Ytq2KwYuau/RnbyVDaWsE9x/S6wYyYFkt3ZiFIkzjM4sTmNK uf1RhOkFpMZikrHmmpXVfA/ZdKq+6xVMl4MEOZzRNS3NOPGhlN3y8Km24FiSUadbKexJ7V9vrj/vk d19d1p5m4VX/zw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55804 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOJzv-0007Pg-H2; Sun, 27 Feb 2022 08:54:03 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 27 Feb 2022 14:53:36 +0100 Message-Id: <20220227135342.10296-6-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220227135342.10296-1-ludo@gnu.org> References: <20220227135342.10296-1-ludo@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/home/services/symlink-manager.scm (update-symlinks-script)[symlink-to-store?]: Avoid extra 'lstat' call. --- gnu/home/services/symlink-manager.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/home/services/symlink-manager.scm b/gnu/home/services/symlink-manager.scm index 6b3a9de3d1..ba42424e8e 100644 --- a/gnu/home/services/symlink-manager.scm +++ b/gnu/home/services/symlink-manager.scm @@ -103,8 +103,13 @@ (define (get-backup-path path) (string-append backup-dir "/." path)) (define (symlink-to-store? path) - (and (equal? (stat:type (lstat path)) 'symlink) - (store-file-name? (readlink path)))) + (catch 'system-error + (lambda () + (store-file-name? (readlink path))) + (lambda args + (if (= EINVAL (system-error-errno args)) + #f + (apply throw args))))) (define (backup-file path) (mkdir-p backup-dir)