From patchwork Tue May 18 16:34:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 29401 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 43B6927BC81; Tue, 18 May 2021 17:35:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8C91C27BC78 for ; Tue, 18 May 2021 17:35:26 +0100 (BST) Received: from localhost ([::1]:46100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lj2gn-0005xU-DM for patchwork@mira.cbaines.net; Tue, 18 May 2021 12:35:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj2gQ-0005wz-1p for guix-patches@gnu.org; Tue, 18 May 2021 12:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lj2gP-0006kN-Qz for guix-patches@gnu.org; Tue, 18 May 2021 12:35:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lj2gP-0004vj-My for guix-patches@gnu.org; Tue, 18 May 2021 12:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48501] [PATCH] daemon: Replace Unicode single quotes with poor simulacra. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 May 2021 16:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48501 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48501@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162135566518875 (code B ref -1); Tue, 18 May 2021 16:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 May 2021 16:34:25 +0000 Received: from localhost ([127.0.0.1]:57112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj2fl-0004uJ-K3 for submit@debbugs.gnu.org; Tue, 18 May 2021 12:34:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:47258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj2fh-0004u9-O0 for submit@debbugs.gnu.org; Tue, 18 May 2021 12:34:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj2fh-0005co-GW for guix-patches@gnu.org; Tue, 18 May 2021 12:34:17 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:49446) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj2fd-0006LG-7S for guix-patches@gnu.org; Tue, 18 May 2021 12:34:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=Fu9Tu3YqNI9kSfinx5Kyit0aifooWcaAFkUjdggVuUQ=; h=date:subject:to: from; b=ZiWfcIRxY4XTwN+IjIRaOgfnbgzXlIDPTUDyI+4HGjDSQPGn+QbX47Rja+gzbu mdvXE8Wosyyv9EIKo5xPoMueGBFXvnuWHPRPflG4NaC71pcKgLhYgW0Zg7dxdWt0Bbebeo X9nLUQP3H/R7lEskZBdFj9Dl8Rd85+9qtABaAK0J7AU5w6sXijRlyEG/nGfJ6GiPuOmJ6c mx7C+lkbTwg0jqH4O1TFMUxvbgJHzHg8TonaUjOG4XTk1JVYShB2WYdERbf9ulOh2uBbiV Y30/hHrlmy6Yc5VXapFNUZKnYMjwMD1SYAKUIqvgML9hOnMwTgOm2j+XvwZ6S0eRqCy3QA == Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id d294dc95 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO) for ; Tue, 18 May 2021 16:34:21 +0000 (UTC) Date: Tue, 18 May 2021 18:34:05 +0200 Message-Id: <20210518163405.3618-1-me@tobias.gr> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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" Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice X-getmail-retrieved-from-mailbox: Patches The correct ‘ and ’ are not considered word boundaries by some(?) terminal emulators like Alacritty, making double-click selection tedious. Avoid them in untranslated strings like it's 1992. * nix/libstore/build.cc (UserLock::acquire) (DerivationGoal::haveDerivation, DerivationGoal::closureRepaired) (DerivationGoal::startBuilder, DerivationGoal::runChild) (DerivationGoal::registerOutputs): Replace ‘’ with `' in output. * nix/libstore/local-store.cc (canonicalisePathMetaData_) (LocalStore::queryValidPathId): Likewise. * nix/libstore/optimise-store.cc (LocalStore::optimisePath_): Likewise. * nix/libutil/util.cc (readLink): Likewise. --- nix/libstore/build.cc | 24 ++++++++++++------------ nix/libstore/local-store.cc | 4 ++-- nix/libstore/optimise-store.cc | 4 ++-- nix/libutil/util.cc | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 5697ae5a43..d6f9a15a46 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -525,7 +525,7 @@ void UserLock::acquire() int err = getgrouplist(pw->pw_name, pw->pw_gid, supplementaryGIDs.data(), &ngroups); if (err == -1) - throw Error(format("failed to get list of supplementary groups for ‘%1%’") % pw->pw_name); + throw Error(format("failed to get list of supplementary groups for `%1%’") % pw->pw_name); supplementaryGIDs.resize(ngroups); @@ -903,7 +903,7 @@ void DerivationGoal::haveDerivation() trace("loading derivation"); if (nrFailed != 0) { - printMsg(lvlError, format("cannot build missing derivation ‘%1%’") % drvPath); + printMsg(lvlError, format("cannot build missing derivation `%1%’") % drvPath); done(BuildResult::MiscFailure); return; } @@ -1058,7 +1058,7 @@ void DerivationGoal::closureRepaired() { trace("closure repaired"); if (nrFailed > 0) - throw Error(format("some paths in the output closure of derivation ‘%1%’ could not be repaired") % drvPath); + throw Error(format("some paths in the output closure of derivation `%1%’ could not be repaired") % drvPath); done(BuildResult::AlreadyValid); } @@ -1748,10 +1748,10 @@ void DerivationGoal::startBuilder() printMsg(lvlChatty, format("setting up chroot environment in `%1%'") % chrootRootDir); if (mkdir(chrootRootDir.c_str(), 0750) == -1) - throw SysError(format("cannot create ‘%1%’") % chrootRootDir); + throw SysError(format("cannot create `%1%’") % chrootRootDir); if (chown(chrootRootDir.c_str(), 0, buildUser.getGID()) == -1) - throw SysError(format("cannot change ownership of ‘%1%’") % chrootRootDir); + throw SysError(format("cannot change ownership of `%1%’") % chrootRootDir); /* Create a writable /tmp in the chroot. Many builders need this. (Of course they should really respect $TMPDIR @@ -1808,7 +1808,7 @@ void DerivationGoal::startBuilder() chmod_(chrootStoreDir, 01775); if (chown(chrootStoreDir.c_str(), 0, buildUser.getGID()) == -1) - throw SysError(format("cannot change ownership of ‘%1%’") % chrootStoreDir); + throw SysError(format("cannot change ownership of `%1%’") % chrootStoreDir); foreach (PathSet::iterator, i, inputPaths) { struct stat st; @@ -2007,13 +2007,13 @@ void DerivationGoal::runChild() local to the namespace, though, so setting MS_PRIVATE does not affect the outside world. */ if (mount(0, "/", 0, MS_REC|MS_PRIVATE, 0) == -1) { - throw SysError("unable to make ‘/’ private mount"); + throw SysError("unable to make `/’ private mount"); } /* Bind-mount chroot directory to itself, to treat it as a different filesystem from /, as needed for pivot_root. */ if (mount(chrootRootDir.c_str(), chrootRootDir.c_str(), 0, MS_BIND, 0) == -1) - throw SysError(format("unable to bind mount ‘%1%’") % chrootRootDir); + throw SysError(format("unable to bind mount `%1%’") % chrootRootDir); /* Set up a nearly empty /dev, unless the user asked to bind-mount the host /dev. */ @@ -2423,7 +2423,7 @@ void DerivationGoal::registerOutputs() if (pathExists(dst)) deletePath(dst); if (rename(actualPath.c_str(), dst.c_str())) throw SysError(format("renaming `%1%' to `%2%'") % actualPath % dst); - throw Error(format("derivation `%1%' may not be deterministic: output `%2%' differs from ‘%3%’") + throw Error(format("derivation `%1%' may not be deterministic: output `%2%' differs from `%3%’") % drvPath % path % dst); } else throw Error(format("derivation `%1%' may not be deterministic: output `%2%' differs") @@ -2501,11 +2501,11 @@ void DerivationGoal::registerOutputs() Path prev = i->path + checkSuffix; if (pathExists(prev)) throw NotDeterministic( - format("output ‘%1%’ of ‘%2%’ differs from ‘%3%’ from previous round") + format("output `%1%’ of `%2%’ differs from `%3%’ from previous round") % i->path % drvPath % prev); else throw NotDeterministic( - format("output ‘%1%’ of ‘%2%’ differs from previous round") + format("output `%1%’ of `%2%’ differs from previous round") % i->path % drvPath); } assert(false); // shouldn't happen @@ -2518,7 +2518,7 @@ void DerivationGoal::registerOutputs() if (curRound < nrRounds) { Path dst = i.second.path + checkSuffix; if (rename(i.second.path.c_str(), dst.c_str())) - throw SysError(format("renaming ‘%1%’ to ‘%2%’") % i.second.path % dst); + throw SysError(format("renaming `%1%’ to `%2%’") % i.second.path % dst); } } diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 675d1ba66f..8b9c9bebd5 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -380,7 +380,7 @@ static void canonicalisePathMetaData_(const Path & path, uid_t fromUid, InodesSe /* Really make sure that the path is of a supported type. */ if (!(S_ISREG(st.st_mode) || S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode))) - throw Error(format("file ‘%1%’ has an unsupported type") % path); + throw Error(format("file `%1%’ has an unsupported type") % path); /* Fail if the file is not owned by the build user. This prevents us from messing up the ownership/permissions of files @@ -647,7 +647,7 @@ uint64_t LocalStore::queryValidPathId(const Path & path) { auto use(stmtQueryPathInfo.use()(path)); if (!use.next()) - throw Error(format("path ‘%1%’ is not valid") % path); + throw Error(format("path `%1%’ is not valid") % path); return use.getInt(0); } diff --git a/nix/libstore/optimise-store.cc b/nix/libstore/optimise-store.cc index eb303ab4c3..2662253b91 100644 --- a/nix/libstore/optimise-store.cc +++ b/nix/libstore/optimise-store.cc @@ -181,12 +181,12 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHa } if (st.st_size != stLink.st_size) { - printMsg(lvlError, format("removing corrupted link ‘%1%’") % linkPath); + printMsg(lvlError, format("removing corrupted link `%1%’") % linkPath); unlink(linkPath.c_str()); goto retry; } - printMsg(lvlTalkative, format("linking ‘%1%’ to ‘%2%’") % path % linkPath); + printMsg(lvlTalkative, format("linking `%1%’ to `%2%’") % path % linkPath); /* Make the containing directory writable, but only if it's not the store itself (we don't want or need to mess with its diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 69f1c634a9..cf5099a4fe 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -202,7 +202,7 @@ Path readLink(const Path & path) if (rlsize == -1) throw SysError(format("reading symbolic link '%1%'") % path); else if (rlsize > st.st_size) - throw Error(format("symbolic link ‘%1%’ size overflow %2% > %3%") + throw Error(format("symbolic link `%1%’ size overflow %2% > %3%") % path % rlsize % st.st_size); return string(buf, st.st_size); }