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

xbps-src: repair bootstrap-update in the !chroot case.

Browse source
This commit is contained in:
Juan RP 2015-04-09 19:45:59 +02:00
parent 5214ac2e8f
commit e2e7b10b0d
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/xbps-src/shutils/pkgtarget.sh
View file

@ -49,14 +49,9 @@ remove_pkg_autodeps() {
msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n" msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n"
tmplogf=$(mktemp) tmplogf=$(mktemp)
if [ -z "$CHROOT_READY" ]; then remove_pkg_cross_deps
xbps-reconfigure -r $XBPS_MASTERDIR -a >> $tmplogf 2>&1 $XBPS_RECONFIGURE_CMD -a >> $tmplogf 2>&1
xbps-remove -r $XBPS_MASTERDIR -Ryo >> $tmplogf 2>&1 $XBPS_REMOVE_CMD -Ryo >> $tmplogf 2>&1
else
remove_pkg_cross_deps
xbps-reconfigure -a >> $tmplogf 2>&1
xbps-remove -Ryo >> $tmplogf 2>&1
fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_red "${pkgver:-xbps-src}: failed to remove autodeps:\n" msg_red "${pkgver:-xbps-src}: failed to remove autodeps:\n"

2
xbps-src
View file

@ -294,7 +294,7 @@ install_bbootstrap() {
} }
bootstrap_update() { bootstrap_update() {
if [ -z "$CHROOT_READY" -o -z "$IN_CHROOT" ]; then if [ -z "$CHROOT_READY" ]; then
return return
fi fi
remove_pkg_autodeps remove_pkg_autodeps