jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: autoremove pkgdeps if XBPS_PREFER_BINPKG_DEPS is set.

Browse source
This commit is contained in:
Juan RP 2011-06-20 18:45:29 +02:00
parent cd099f626e
commit 66c3ae82d3
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xbps-src/shutils/pkgtarget_funcs.sh.in
View file

@ -166,6 +166,16 @@ install_pkg()
if [ -d "$wrksrc" -a "$dontrm_builddir" = "no" ]; then
remove_tmpl_wrksrc $wrksrc
fi
#
# If XBPS_PREFER_BINPKG_DEPS is set, we should remove those
# package dependencies installed by the target package, do it.
#
if [ -n "$XBPS_PREFER_BINPKG_DEPS" ]; then
msg_normal "Removing binary package dependencies...\n"
${XBPS_BIN_CMD} -Rpyf autoremove
fi
return $?
}
#

5
xbps-src/shutils/stow_funcs.sh
View file

@ -182,7 +182,10 @@ unstow_pkg_real()
# If it's a metapkg, do nothing.
:
elif [ ! -f ${XBPS_PKGMETADIR}/${pkgname}/flist ]; then
msg_error "$pkgname is incomplete, missing flist.\n"
# If flist not found, perhaps the pkg has been installed via
# xbps-bin, so try to remove it.
${XBPS_BIN_CMD} -pyf remove ${pkgname} || \
msg_error "${pkgname}: failed to remove!\n"
elif [ ! -w ${XBPS_PKGMETADIR}/${pkgname}/flist ]; then
msg_error "$pkgname cannot be removed (permission denied).\n"
elif [ -s ${XBPS_PKGMETADIR}/${pkgname}/flist ]; then