[pacman-dev] [PATCH] 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. --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..82c9367 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 -- 2.10.0
On 30/09/16 08:57, Levente Polyak wrote:
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.
Thanks. Note that I have no intention of making a 5.0.x release. I anyone wants one, cherry pick (with -x) all the relevant patches onto the release/5.0.x branch and ping me to pull it. Allan
participants (2)
-
Allan McRae
-
Levente Polyak