snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps-src: improve error message on dependencies installation 

Message contained one of many packages to install,
incorrectly suggesting that this is problematic one.
Remove that. List of packages is printed on previous line.
This commit is contained in:
Piotr Wójcik 2021-10-14 18:21:22 +02:00 committed by Piotr
parent 66b2562b19
commit 9cdfea60ca
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/build_dependencies.sh
View File

@ -69,8 +69,8 @@ setup_pkg_depends() {
# -1 (255): unexpected error. # -1 (255): unexpected error.
install_pkg_from_repos() { install_pkg_from_repos() {
local cross="$1" rval tmplogf cmd local cross="$1" target="$2" rval tmplogf cmd
shift shift 2
[ $# -eq 0 ] && return 0 [ $# -eq 0 ] && return 0
@ -91,7 +91,7 @@ install_pkg_from_repos() {
;; ;;
*) *)
[ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps [ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps
msg_red "$pkgver: failed to install '$1' dependency! (error $rval)\n" msg_red "$pkgver: failed to install $target dependencies! (error $rval)\n"
cat $tmplogf cat $tmplogf
rm -f $tmplogf rm -f $tmplogf
msg_error "Please see above for the real error, exiting...\n" msg_error "Please see above for the real error, exiting...\n"
@ -411,7 +411,7 @@ install_pkg_deps() {
echo "=> $pkgver: installing host dependencies: ${host_binpkg_deps[@]} ..." echo "=> $pkgver: installing host dependencies: ${host_binpkg_deps[@]} ..."
[[ $NOCOLORS ]] || printf "\033[m" [[ $NOCOLORS ]] || printf "\033[m"
fi fi
install_pkg_from_repos "" "${host_binpkg_deps[@]}" install_pkg_from_repos "" host "${host_binpkg_deps[@]}"
fi fi
if [[ ${binpkg_deps} ]]; then if [[ ${binpkg_deps} ]]; then
@ -421,7 +421,7 @@ install_pkg_deps() {
echo "=> $pkgver: installing target dependencies: ${binpkg_deps[@]} ..." echo "=> $pkgver: installing target dependencies: ${binpkg_deps[@]} ..."
[[ $NOCOLORS ]] || printf "\033[m" [[ $NOCOLORS ]] || printf "\033[m"
fi fi
install_pkg_from_repos "$cross" "${binpkg_deps[@]}" install_pkg_from_repos "$cross" target "${binpkg_deps[@]}"
fi fi
return 0 return 0