PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xbps-src: use unique names for bulk update commands

Browse Source 
A regression introduced in 4c43245e0b is causing the 'xbps-src update-sys'
command to skip the final step of installing the updated packages.

This happens because the `cmd` variable name clashes with a loop
variable used in common/environment/setup/install.sh script (line 16).
Thus the `"$cmd" == installed` comparison
(common/xbps-src/shutils/bulk.sh line 122) fails and the installation
step is skipped.

Using unique variable names in `bulk.sh` avoids this problem.

Closes: #39969 [via git-merge-pr]
This commit is contained in:
Heinrich Kruger 2022-10-15 14:24:37 +01:00 committed by Duncaen
parent 85b372f02f
commit 7c3f5a15b9
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/xbps-src/shutils/bulk.sh
View File

@ -54,7 +54,7 @@ bulk_sortdeps() {
}
bulk_build() {
local cmd="$1"
local bulk_build_cmd="$1"
local NPROCS=$(($(nproc)*2))
local NRUNNING=0
@ -67,7 +67,7 @@ bulk_build() {
fi
# Compare installed pkg versions vs srcpkgs
case "$cmd" in
case "$bulk_build_cmd" in
installed)
bulk_sortdeps $(xbps-checkvers -f '%n' -I -D "$XBPS_DISTDIR")
return $?
@ -97,9 +97,9 @@ bulk_build() {
}
bulk_update() {
local cmd="$1" pkgs f rval
local bulk_update_cmd="$1" pkgs f rval
pkgs="$(bulk_build "${cmd}")"
pkgs="$(bulk_build "${bulk_update_cmd}")"
[[ -z $pkgs ]] && return 0
msg_normal "xbps-src: the following packages must be rebuilt and updated:\n"
@ -119,7 +119,7 @@ bulk_update() {
msg_error "xbps-src: failed to build $pkgver pkg!\n"
fi
done
if [ -n "$pkgs" -a "$cmd" == installed ]; then
if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
echo
msg_normal "xbps-src: updating your system, confirm to proceed...\n"
${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1