0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch 1.0 KB

1234567891011121314151617181920212223242526272829
  1. From 38a179d91b79efb44b33c5b5b64d2ee4202921b5 Mon Sep 17 00:00:00 2001
  2. From: Luke Shumaker <lukeshu@parabola.nu>
  3. Date: Mon, 6 Aug 2018 23:50:39 -0400
  4. Subject: [PATCH 2/4] makepkg: check_pkgrel: Don't say "decimal" in the error
  5. message
  6. If you have a malformed pkgrel, the error message says that it must be a
  7. "decimal". That isn't quite true, as that would mean that `1.1 == 1.10`.
  8. ---
  9. scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 +-
  10. 1 file changed, 1 insertion(+), 1 deletion(-)
  11. diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in
  12. index 762f054a..30fa6d71 100644
  13. --- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in
  14. +++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in
  15. @@ -37,7 +37,7 @@ check_pkgrel() {
  16. fi
  17. if [[ $rel != +([0-9])?(.+([0-9])) ]]; then
  18. - error "$(gettext "%s must be a decimal, not %s.")" "pkgrel${type:+ in $type}" "$rel"
  19. + error "$(gettext "%s must be of the form 'integer[.integer]', not %s.")" "pkgrel${type:+ in $type}" "$rel"
  20. return 1
  21. fi
  22. }
  23. --
  24. 2.18.0