From 2c562d782c2c518d657b1702c47b53f13329f83f Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sun, 2 Jun 2024 19:42:15 +0200 Subject: Revert "local/update-03-filename: Allow @ in filenames" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As it turns out, Portage will silently drop files containing an @ char during Manifest generation. See bug 411127 and bug 106544 for further reference. This reverts commit e24eacaa31707ef669cd5a9747a1bf08a5759fdf. Signed-off-by: Ulrich Müller Signed-off-by: Arthur Zamarin --- local/update-03-filename | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/local/update-03-filename b/local/update-03-filename index a54c88f..adbbc5f 100755 --- a/local/update-03-filename +++ b/local/update-03-filename @@ -1,6 +1,6 @@ #!/bin/bash # gentoo-infra: infra/githooks.git:update-03-filename -# Copyright 2015-2024 Ulrich Müller and others +# Copyright 2015-2021 Ulrich Müller and others # Distributed under the terms of the GNU General Public License v2 or later # Author: Ulrich Müller @@ -18,12 +18,12 @@ zeros=0000000000000000000000000000000000000000 [[ ${newrev} == "${zeros}" ]] && exit 0 # no need to check for new branch because we skip non-master commits above -# Filenames must contain only the characters [A-Za-z0-9._+@-] and must +# Filenames must contain only the characters [A-Za-z0-9._+-] and must # not begin with a dot, a hyphen, or a plus sign. # https://devmanual.gentoo.org/general-concepts/tree/#what-belongs-in-the-tree%3F # https://devmanual.gentoo.org/ebuild-writing/file-format/#file-naming-rules export LC_ALL=C -regex='^([A-Za-z0-9_][A-Za-z0-9._+-]*/)*[A-Za-z0-9_@][A-Za-z0-9._+@-]*$' +regex='^([A-Za-z0-9_][A-Za-z0-9._+-]*/)*[A-Za-z0-9_][A-Za-z0-9._+-]*$' exceptions=( .editorconfig .mailmap -- cgit v1.2.3-65-gdbad