diff options
| author | Levente Polyak <anthraxx@archlinux.org> | 2016-09-30 00:57:34 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-10-10 10:38:04 +1000 |
| commit | 3190b87b65b038ce31a37f99fb058f3160007cbb (patch) | |
| tree | df09f9c7fc792c770a3c1c76ce7b30fdc277f92e | |
| parent | 87ee9693bd70ad5b17b9542fa67a1a58cd0f7c29 (diff) | |
| download | pacman-3190b87b65b038ce31a37f99fb058f3160007cbb.tar.xz | |
fix --printsrcinfo unify arch and non-arch specific variables
This fixes the issue with --printsrcinfo that all arch specific variants
of a variable get merged into their non arch specific variant.
The .SRCINFO file ends up having $depends containing $depends_x86_64
and omitting the latter.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce511..82c9367b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1476,7 +1476,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} # check the PKGBUILD for some basic requirements lint_pkgbuild || exit 1 -if (( !SOURCEONLY )); then +if (( !SOURCEONLY && !PRINTSRCINFO )); then merge_arch_attrs fi |