cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

be even more specific: only prevent backsubst on dewey if we are a dewey

Browse Source 
number ourselves
This commit is contained in:
espie 2018-05-20 07:57:16 +00:00
parent 9d0f07ab47
commit bd30d33a5d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infrastructure/lib/OpenBSD/ReverseSubst.pm
View File

@ -1,4 +1,4 @@
# $OpenBSD: ReverseSubst.pm,v 1.12 2018/05/20 07:50:08 espie Exp $
# $OpenBSD: ReverseSubst.pm,v 1.13 2018/05/20 07:57:16 espie Exp $
# Copyright (c) 2018 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -244,7 +244,10 @@ sub unsubst_version
while ($string =~ s/(.*?)\Q$v\E//) {
$done .= $1;
# if it's in the middle of a larger version string, nope
if ($done =~ m/\d\.?$/ || $string =~ m/^\.?\d/) {
if ($done =~ m/\d$/ || $string =~ m/^\d/ ||
# also do dewey numbers if $v is also one
($v =~ m/\./ &&
($done =~ m/\d\.$/ || $string =~ m/^\.\d/))) {
$done .= $v;
} else {
# otherwise it's okay