diff options
| author | Levente Polyak <anthraxx@archlinux.org> | 2016-09-30 00:57:34 +0200 |
|---|---|---|
| committer | Andrew Gregory <andrew.gregory.8@gmail.com> | 2017-05-09 05:27:43 +0200 |
| commit | 5de2ad13fd8983210638b7c3ba3e39285e35446d (patch) | |
| tree | 4fe346f4683eaacc3cba0f2c7638654929c4ab8f | |
| parent | c889403cf71f0d94d6bcc0cf1fac4790668f4635 (diff) | |
| download | pacman-5de2ad13fd8983210638b7c3ba3e39285e35446d.tar.gz pacman-5de2ad13fd8983210638b7c3ba3e39285e35446d.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>
(cherry picked from commit 3190b87b65b038ce31a37f99fb058f3160007cbb)
| -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 7fd76b20..450473b3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2029,7 +2029,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 |