diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-07 00:10:08 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-07 00:10:08 -0400 |
| commit | 67bf884802bfd4b190fb5f8cd521c37660f05d53 (patch) | |
| tree | 0447f5ddae8794090110348075029c7ff275e205 /libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch | |
| parent | 6af3b6469459012f1c71117c45959ff3d836103c (diff) | |
| download | abslibre-67bf884802bfd4b190fb5f8cd521c37660f05d53.tar.gz abslibre-67bf884802bfd4b190fb5f8cd521c37660f05d53.tar.bz2 abslibre-67bf884802bfd4b190fb5f8cd521c37660f05d53.zip | |
libre/pacman: Try out some new patches
Diffstat (limited to 'libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch')
| -rw-r--r-- | libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch b/libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch new file mode 100644 index 000000000..7704ce730 --- /dev/null +++ b/libre/pacman/0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch @@ -0,0 +1,31 @@ +From 0a5f9c19a3c9c64f6ffacb860d4c7ae2727d6078 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Mon, 6 Aug 2018 23:51:47 -0400 +Subject: [PATCH 3/4] makepkg: check_pkgver: Report what the bad pkgver is + +For consistency with check_epoch and check_pkgrel. + +I think that this is important because if there are multiple +provides/depends/whatever that include a version, and one of them is +malformed, including the bad version in the error message identified +which one is the problem. +--- + scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +index c105212b..65216b64 100644 +--- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in ++++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +@@ -38,7 +38,7 @@ check_pkgver() { + fi + + if [[ $ver = *[[:space:]/:-]* ]]; then +- error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver${type:+ in $type}" ++ error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace; got %s.")" "pkgver${type:+ in $type}" "$ver" + return 1 + fi + } +-- +2.18.0 + |