From patchwork Mon Sep 23 11:21:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brennan Vincent X-Patchwork-Id: 31365 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 0992427BBEA; Mon, 23 Sep 2024 12:22:05 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 7821F27BBE9 for ; Mon, 23 Sep 2024 12:22:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssh8U-0000m9-FN; Mon, 23 Sep 2024 07:21:46 -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 1ssh8N-0000Ch-Nj for guix-patches@gnu.org; Mon, 23 Sep 2024 07:21:39 -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 1ssh8N-00042b-DS for guix-patches@gnu.org; Mon, 23 Sep 2024 07:21:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=57DTYeWzC0cm2aQ/nQQEFhfKxPpwhAzvZgmLxu3dKUI=; b=panxcc1DIfu8ZSONCEPY01kRs/UjUdlBBjEXEme68nWFr+ykLaEjzpwuqjWitBCdzmdyLwKe/Z+bWp2g3CCIDEU6ofWJDhdvweciEitNFfTivuwYPlB/0l7LRJd7yZ+bMhQ/hKz+b0wezawhE/E28HmbxLkKK9TFy+Fi6p+rU9jHvG30xK3gOFHikGYMpiUAWivlt9iR/hKrAIeJ2k74NY11ajcJeTPujCXOOtjbt4VDdvm8woAQhhR2J/0FU3BPDULk6BMsVOFTkI5o3df9sPWPO+PHBrrXGgX+4pUYnRAraAqbVaTlb6coEIxAOR58KvnljmkVFCRCrR0pk5vsCA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssh8k-0007Dd-4w for guix-patches@gnu.org; Mon, 23 Sep 2024 07:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73438] [PATCH] Better error message in checkStoreName Resent-From: Brennan Vincent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Sep 2024 11:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73438 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73438@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172709051127724 (code B ref -1); Mon, 23 Sep 2024 11:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Sep 2024 11:21:51 +0000 Received: from localhost ([127.0.0.1]:43293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssh8Y-0007D6-V2 for submit@debbugs.gnu.org; Mon, 23 Sep 2024 07:21:51 -0400 Received: from lists.gnu.org ([209.51.188.17]:54838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssh8X-0007Cy-0X for submit@debbugs.gnu.org; Mon, 23 Sep 2024 07:21:49 -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 1ssh88-0007sq-Ve for guix-patches@gnu.org; Mon, 23 Sep 2024 07:21:25 -0400 Received: from smtp.umanwizard.com ([54.203.248.109]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssh7z-0003zw-5L for guix-patches@gnu.org; Mon, 23 Sep 2024 07:21:23 -0400 Received: from localhost ([98.171.11.233]) by smtp.umanwizard.com ; 23 Sep 2024 11:21:09 +0000 X-Fes-Received-For: guix-patches@gnu.org X-Fes-Received-From: From: Brennan Vincent X-Envelope-From: b681f718b15b9b38e4d28a653bdf5f5ea974939a Mon Sep 17 00:00:00 2001 Date: Mon, 23 Sep 2024 07:21:07 -0400 Message-ID: <871q1ad3a4.fsf@denver.mail-host-address-is-not-set> MIME-Version: 1.0 X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost Received-SPF: pass client-ip=54.203.248.109; envelope-from=brennan@umanwizard.com; helo=smtp.umanwizard.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 When trying to pass a local-file beginning with a dot to something like home-files-service-type, one gets an error message like: guix home: error: invalid name: `.vimrc' which does not explain what went wrong. This update should make it more clear. Change-Id: I045a663bc6cd9844677c65b38a31d3941cf212b5 --- nix/libstore/store-api.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 6ea75bb9bcc52521f0bb3f121799745fdc17f1c9 diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc index 781fb9e693..38a1403a71 100644 --- a/nix/libstore/store-api.cc +++ b/nix/libstore/store-api.cc @@ -61,7 +61,7 @@ void checkStoreName(const string & name) /* Disallow names starting with a dot for possible security reasons (e.g., "." and ".."). */ if (string(name, 0, 1) == ".") - throw Error(format("invalid name: `%1%'") % name); + throw Error(format("invalid name: `%1%' (can't begin with dot)") % name); foreach (string::const_iterator, i, name) if (!((*i >= 'A' && *i <= 'Z') || (*i >= 'a' && *i <= 'z') ||