moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: account for nonfree repo with -E

Browse source 
This makes sure nonfree packages don't get rebuilt when -E is
passed to xbps-src.

[ci skip]
This commit is contained in:
q66 2019-12-09 02:38:41 +01:00 • committed by Juan RP
parent 4a967a96da
commit 3a363d2611
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/xbps-src/shutils/common.sh
View file

@ -306,7 +306,7 @@ get_subpkgs() {
setup_pkg() { setup_pkg() {
local pkg="$1" cross="$2" show_problems="$3" local pkg="$1" cross="$2" show_problems="$3"
local basepkg val _vars f dbgflags arch local basepkg val _vars f dbgflags arch extrarepo
[ -z "$pkg" ] && return 1 [ -z "$pkg" ] && return 1
basepkg=${pkg%-32bit} basepkg=${pkg%-32bit}
@ -455,7 +455,11 @@ setup_pkg() {
arch="$XBPS_TARGET_MACHINE" arch="$XBPS_TARGET_MACHINE"
fi fi
if [ -n "$XBPS_BINPKG_EXISTS" ]; then if [ -n "$XBPS_BINPKG_EXISTS" ]; then
if [ "$($XBPS_QUERY_XCMD -i -R -ppkgver $pkgver 2>/dev/null)" = "$pkgver" ]; then # nonfree packages need this otherwise they'll rebuild even with -E
if [ -n "$repository" ]; then
extrarepo=" --repository=$XBPS_REPOSITORY/$repository"
fi
if [ "$($XBPS_QUERY_XCMD $extrarepo -i -R -ppkgver $pkgver 2>/dev/null)" = "$pkgver" ]; then
exit_and_cleanup exit_and_cleanup
fi fi
fi fi