On Tue, Nov 23, 2021 at 07:44:04AM +0100, Anton Lindqvist wrote:
> On Sun, Nov 21, 2021 at 03:15:52AM -0700, Marc Espie wrote:
> > CVSROOT: /cvs
> > Module name: src
> > Changes by: es...@cvs.openbsd.org 2021/11/21 03:15:52
> >
> > Modified files:
> > usr.sbin/pkg_add/OpenBSD: PkgSpec.pm
> >
> > Log message:
> > temporarily reallow "empty" flavor parts so that rsync-- works again
> > (I really need to split that code off)
>
> This broke regress:
>
> + . /usr/local/libexec/robsd/util.sh
> + . /usr/local/libexec/robsd/util-ports.sh
> + . /usr/local/libexec/robsd/util-regress.sh
> + regress_root usr.sbin/pkg_add
> + unpriv anton exec make -C /home/src/regress/usr.sbin/pkg_add
> ==== pkgnames ====
> perl -I /home/src/regress/usr.sbin/pkg_add
> /home/src/regress/usr.sbin/pkg_add/check-name
> 1..26
> ok 1 - flavor with number
> ok 2 - before 1.0p0 came 1.0
> ok 3 - 1.0 and 1.0p0 both match <=1.0p0
> ok 4 - any 1.0p* matches 1.0
> ok 5 - before 1.0 came 1.0rc2
> ok 6 - before 1.0pl1 came 1.0
> ok 7 - simple stem lookup
> ok 8 - simple stem lookup with several results
> ok 9 - stem lookup, no duplicates
> ok 10 - stem lookup with flavor
> ok 11 - complicated stem matching
> ok 12 - bogus stem matching with no version
> ok 13 - stem matching with no version
> ok 14 - canonical names
> ok 15 - invalid spec
> ok 16 - pkgname without version
> ok 17 - numerical flavor
> ok 18 - mixed up vp
> ok 19 - correct name
> ok 20 - check order
> ok 21 - standard spec
> ok 22 - invalid spec stem->=*
> ok 23 - invalid spec stem-*.3
> not ok 24 - empty flavor spec
> # Failed test 'empty flavor spec'
> # at /home/src/regress/usr.sbin/pkg_add/check-name line 134.
> ok 25 - empty stem
> ok 26 - branch specifier not okay in specs
> # Looks like you failed 1 test of 26.
> *** Error 1 in . (Makefile:53 'pkgnames')
> FAILED
>
This is temporary
