diff options
| -rw-r--r-- | doc/PKGBUILD.5.txt | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 22c56be3..b0f2bdb6 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -160,7 +160,9 @@ name. The syntax is: `$$source=('filename::url')$$` depend on 'cron' rather than 'dcron OR fcron'. Versioned provisions are also possible, in the 'name=version' format. For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' - dependency of other packages. + dependency of other packages. Provisions involving the '>' and '<' + operators are invalid as only specifc versions of a package may be + provided. *replaces (array)*:: An array of packages that this package should replace, and can be used diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b18665c5..04d2aca1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1439,11 +1439,11 @@ if [ -z "$pkgrel" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" exit 1 fi -if [ $(echo "$pkgver" | grep '-') ]; then +if [ "$pkgver" != "${pkgver//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" exit 1 fi -if [ $(echo "$pkgrel" | grep '-') ]; then +if [ "$pkgrel" != "${pkgrel//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" exit 1 fi @@ -1465,6 +1465,14 @@ if ! in_array $CARCH ${arch[@]}; then fi fi +for provide in ${provides[@]}; do + if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then + error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" + exit 1 + fi +done +unset provide + if [ "$install" -a ! -f "$install" ]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" exit 1 |