diff options
Diffstat (limited to 'libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch')
| -rw-r--r-- | libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch b/libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch new file mode 100644 index 000000000..e005e1b4e --- /dev/null +++ b/libre-testing/pacman/0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch @@ -0,0 +1,28 @@ +From 38a179d91b79efb44b33c5b5b64d2ee4202921b5 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Mon, 6 Aug 2018 23:50:39 -0400 +Subject: [PATCH 2/4] makepkg: check_pkgrel: Don't say "decimal" in the error + message + +If you have a malformed pkgrel, the error message says that it must be a +"decimal". That isn't quite true, as that would mean that `1.1 == 1.10`. +--- + scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +index 762f054a..30fa6d71 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +@@ -37,7 +37,7 @@ check_pkgrel() { + fi + + if [[ $rel != +([0-9])?(.+([0-9])) ]]; then +- error "$(gettext "%s must be a decimal, not %s.")" "pkgrel${type:+ in $type}" "$rel" ++ error "$(gettext "%s must be of the form 'integer[.integer]', not %s.")" "pkgrel${type:+ in $type}" "$rel" + return 1 + fi + } +-- +2.18.0 + |