Skip to content

Commit 23bef71

Browse files
webknjazthesamesam
authored andcommitted
euse: Recognize capital letters in atom names
This fixes a bug [[1]] where `euse` would treat parts of atom names with capital letters as versions and hit surprising code branches. Closes: https://bugs.gentoo.org/941200 Signed-off-by: Sviatoslav Sydorenko <webknjaz@redhat.com> Part-of: #53 Closes: #53 Signed-off-by: Sam James <sam@gentoo.org>
1 parent c0995c5 commit 23bef71

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bin/euse

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ get_useflags() {
294294
# Flip signs of use.mask (it's interpreted oppositely),
295295
ACTIVE_FLAGS[6]=$(reduce_incrementals_trump \
296296
$(cat $(traverse_profile "use.mask") | sed -re "/^#.*$/{d}") \
297-
| sed -re "s/(^| )-[^ ]*//g" -e "s/(^| )([a-z0-9])/ -\2/g")
297+
| sed -re "s/(^| )-[^ ]*//g" -e "s/(^| )([a-zA-Z0-9])/ -\2/g")
298298
ACTIVE_FLAGS[7]=$(reduce_incrementals \
299299
$(cat $(traverse_profile "use.force") \
300300
| sed -re "/^#.*$/ {d}"))
@@ -965,7 +965,7 @@ fi
965965
# Environment:
966966
# PACKAGE - Package atom for which to remove flag
967967
scrub_use_flag() {
968-
local atom_re="^[<>]?=?([a-z][\da-z/-]+[a-z])(-[0-9pr._*-]+)?"
968+
local atom_re="^[<>]?=?([a-zA-Z][\da-zA-Z/-]+[a-zA-Z])(-[0-9pr._*-]+)?"
969969
local filename=${1}
970970
# Ignore leading - on flag
971971
local flag=${2#*-}
@@ -1024,7 +1024,7 @@ scrub_use_flag() {
10241024
modify_package() {
10251025
get_useflags
10261026

1027-
local atom_re="^[<>]?=?([a-z][0-9a-z/-]+[0-9a-z])(-[0-9pr._*-]+)?"
1027+
local atom_re="^[<>]?=?([a-zA-Z][0-9a-zA-Z/-]+[0-9a-zA-Z])(-[0-9pr._*-]+)?"
10281028
local pkg=$(echo "${PACKAGE}" | sed -re "s/${atom_re}/\1/")
10291029
local V=$(echo "${PACKAGE}" | sed -re "s/${atom_re}/\2/")
10301030
local pkg_re="[<>]?=?${pkg}(-[\dpr._*-]+)?"

0 commit comments

Comments
 (0)