diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2019-05-07 20:39:40 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2019-05-08 12:45:26 +1000 |
| commit | a0f4429e95240b8a275ab6c43c4b8d0b11cfcd5d (patch) | |
| tree | 082ea0e5451b4f827ce3f98671908c67142337cd | |
| parent | 583f3122ce3b98c384165d47c126aaa5c98ea392 (diff) | |
| download | pacman-a0f4429e95240b8a275ab6c43c4b8d0b11cfcd5d.tar.xz | |
makepkg: use more schema.sh to clean the environment of special variables
Fixes "arch" and "checkdepends" never having been unset, fixes b2sums
(but not ${!b2sums_@}) being recently left out.
The "build" function used to be unset as well, explicitly unset it as a
function and do the same for other official functions as well.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fd06ce02..4559afec 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1211,9 +1211,9 @@ else fi fi -unset pkgname pkgbase pkgver pkgrel epoch pkgdesc url license groups provides -unset md5sums replaces depends conflicts backup source install changelog build -unset sha{1,224,256,384,512}sums makedepends optdepends options noextract validpgpkeys +unset pkgname "${pkgbuild_schema_strings[@]}" "${pkgbuild_schema_arrays[@]}" +unset "${known_hash_algos[@]/%/sums}" +unset -f pkgver prepare build check package "${!package_@}" unset "${!makedepends_@}" "${!depends_@}" "${!source_@}" "${!checkdepends_@}" unset "${!optdepends_@}" "${!conflicts_@}" "${!provides_@}" "${!replaces_@}" unset "${!md5sums_@}" "${!sha1sums_@}" "${!sha224sums_@}" "${!sha256sums_@}" |