summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlastair Hughes <hobbitalastair@gmail.com>2016-02-06 08:54:31 +0100
committerAllan McRae <allan@archlinux.org>2016-02-20 05:01:53 +0100
commitc72ca3d539072acf55b4deb3a5646ce0717f08a1 (patch)
tree1323261d973e0159f77d95e3b591375fc4d4723a
parent3cb1669e07106e9108976a76b7d2f37e659bce6c (diff)
downloadpacman-c72ca3d539072acf55b4deb3a5646ce0717f08a1.tar.gz
pacman-c72ca3d539072acf55b4deb3a5646ce0717f08a1.tar.xz
Make "makepkg -g" ignore the current architecture.
Commit 663c74150ab4ba6d3adc55b0e3f539557a16e352 (makepkg: merge arch dependent variables after PKGBUILD linting) broke "makepkg -g" on a PKGBUILD which did not include the current architecture, by moving the lint_pkgbuild call before GENINTEG was processed. Fix that by setting IGNOREARCH for the "-g" option. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 80b95f41..16c21b72 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1803,7 +1803,8 @@ while true; do
-e|--noextract) NOEXTRACT=1 ;;
-f|--force) FORCE=1 ;;
-F) INFAKEROOT=1 ;;
- -g|--geninteg) GENINTEG=1 ;;
+ # generating integrity checks does not depend on architecture
+ -g|--geninteg) GENINTEG=1 IGNOREARCH=1;;
--holdver) HOLDVER=1 ;;
-i|--install) INSTALL=1 ;;
--key) shift; GPGKEY=$1 ;;