makepkg: Better error messages for versions in (check, make, opt)depends/provides/conflicts
Given the depends
depends=('foo>=1.2-1.par2')
and the error message
==> ERROR: pkgver in depends is not allowed to contain colons, forward slashes, hyphens or whitespace.
One would be lead to believe that the problem is that they gave a pkgrel in
depends at all, not that the pkgrel contains letters.
Each of the (check,make,opt)depends, conflicts, and provides linters use a
glob to trim off properly formed epoch an rel from the full version string,
and pass the remainder to check_pkgver(). This does a good job of
accepting/rejecting full versions, but doesn't do a good job of generating
good error messages when rejecting if it's because of the epoch or rel.
1. Factor out check_epoch() and check_pkgrel() from lint_epoch() and
lint_pkgrel(), similarly to check_pkgver().
2. Add a check_fullpkgver() that takes a full [epoch:]ver[-rel] string and
splits it in to epoch/ver/rel, and calls the appropriate check_ function
on each.
3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and
provides linters.
Signed-off-by: Allan McRae <allan@archlinux.org>
2018-08-09 13:41:12 -04:00
|
|
|
#!/bin/bash
|
|
|
|
|
#
|
|
|
|
|
# fullpkgver.sh - Check whether a full version conforms to requirements.
|
|
|
|
|
#
|
2022-01-02 13:34:52 +10:00
|
|
|
# Copyright (c) 2018-2022 Pacman Development Team <pacman-dev@lists.archlinux.org>
|
makepkg: Better error messages for versions in (check, make, opt)depends/provides/conflicts
Given the depends
depends=('foo>=1.2-1.par2')
and the error message
==> ERROR: pkgver in depends is not allowed to contain colons, forward slashes, hyphens or whitespace.
One would be lead to believe that the problem is that they gave a pkgrel in
depends at all, not that the pkgrel contains letters.
Each of the (check,make,opt)depends, conflicts, and provides linters use a
glob to trim off properly formed epoch an rel from the full version string,
and pass the remainder to check_pkgver(). This does a good job of
accepting/rejecting full versions, but doesn't do a good job of generating
good error messages when rejecting if it's because of the epoch or rel.
1. Factor out check_epoch() and check_pkgrel() from lint_epoch() and
lint_pkgrel(), similarly to check_pkgver().
2. Add a check_fullpkgver() that takes a full [epoch:]ver[-rel] string and
splits it in to epoch/ver/rel, and calls the appropriate check_ function
on each.
3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and
provides linters.
Signed-off-by: Allan McRae <allan@archlinux.org>
2018-08-09 13:41:12 -04:00
|
|
|
#
|
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
#
|
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH" ]] && return
|
|
|
|
|
LIBMAKEPKG_LINT_PKGBUILD_FULLPKGVER_SH=1
|
|
|
|
|
|
2023-10-21 01:45:20 +01:00
|
|
|
MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
|
makepkg: Better error messages for versions in (check, make, opt)depends/provides/conflicts
Given the depends
depends=('foo>=1.2-1.par2')
and the error message
==> ERROR: pkgver in depends is not allowed to contain colons, forward slashes, hyphens or whitespace.
One would be lead to believe that the problem is that they gave a pkgrel in
depends at all, not that the pkgrel contains letters.
Each of the (check,make,opt)depends, conflicts, and provides linters use a
glob to trim off properly formed epoch an rel from the full version string,
and pass the remainder to check_pkgver(). This does a good job of
accepting/rejecting full versions, but doesn't do a good job of generating
good error messages when rejecting if it's because of the epoch or rel.
1. Factor out check_epoch() and check_pkgrel() from lint_epoch() and
lint_pkgrel(), similarly to check_pkgver().
2. Add a check_fullpkgver() that takes a full [epoch:]ver[-rel] string and
splits it in to epoch/ver/rel, and calls the appropriate check_ function
on each.
3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and
provides linters.
Signed-off-by: Allan McRae <allan@archlinux.org>
2018-08-09 13:41:12 -04:00
|
|
|
|
2023-10-21 01:45:20 +01:00
|
|
|
source "$MAKEPKG_LIBRARY/lint_pkgbuild/epoch.sh"
|
|
|
|
|
source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgrel.sh"
|
|
|
|
|
source "$MAKEPKG_LIBRARY/lint_pkgbuild/pkgver.sh"
|
makepkg: Better error messages for versions in (check, make, opt)depends/provides/conflicts
Given the depends
depends=('foo>=1.2-1.par2')
and the error message
==> ERROR: pkgver in depends is not allowed to contain colons, forward slashes, hyphens or whitespace.
One would be lead to believe that the problem is that they gave a pkgrel in
depends at all, not that the pkgrel contains letters.
Each of the (check,make,opt)depends, conflicts, and provides linters use a
glob to trim off properly formed epoch an rel from the full version string,
and pass the remainder to check_pkgver(). This does a good job of
accepting/rejecting full versions, but doesn't do a good job of generating
good error messages when rejecting if it's because of the epoch or rel.
1. Factor out check_epoch() and check_pkgrel() from lint_epoch() and
lint_pkgrel(), similarly to check_pkgver().
2. Add a check_fullpkgver() that takes a full [epoch:]ver[-rel] string and
splits it in to epoch/ver/rel, and calls the appropriate check_ function
on each.
3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and
provides linters.
Signed-off-by: Allan McRae <allan@archlinux.org>
2018-08-09 13:41:12 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
check_fullpkgver() {
|
|
|
|
|
local fullver=$1 type=$2
|
|
|
|
|
local ret=0
|
|
|
|
|
|
|
|
|
|
# If there are multiple colons or multiple hyphens, there's a
|
|
|
|
|
# question of how we split it--it's invalid either way, but it
|
|
|
|
|
# will affect error messages. Let's mimic version.c:parseEVR().
|
|
|
|
|
|
|
|
|
|
if [[ $fullver = *:* ]]; then
|
|
|
|
|
# split at the *first* colon
|
|
|
|
|
check_epoch "${fullver%%:*}" "$type" || ret=1
|
|
|
|
|
fullver=${fullver#*:}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Since ver isn't allowed to be empty, don't let rel strip it
|
|
|
|
|
# down to nothing. Given "-XXX", "pkgver isn't allowed to
|
|
|
|
|
# contain hyphens" is more helpful than "pkgver isn't allowed
|
|
|
|
|
# to be empty".
|
|
|
|
|
if [[ $fullver = ?*-* ]]; then
|
|
|
|
|
# split at the *last* hyphen
|
|
|
|
|
check_pkgrel "${fullver##*-}" "$type" || ret=1
|
|
|
|
|
fullver=${fullver%-*}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
check_pkgver "$fullver" "$type" || ret=1
|
|
|
|
|
|
|
|
|
|
return $ret
|
|
|
|
|
}
|