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

chroot.sh: improve error messages.

Browse source 
--HG--
extra : convert_revision : a0d0b166ca331bd8af9cdf1c54459b09156ab978
This commit is contained in:
Juan RP 2008-12-18 11:40:43 +01:00
parent d9fb96533f
commit f19afb5fe0
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
utils/sh/chroot.sh
View file

@ -224,7 +224,11 @@ umount_chroot_fs()
. $XBPS_SHUTILSDIR/builddep_funcs.sh . $XBPS_SHUTILSDIR/builddep_funcs.sh
check_installed_pkg xbps-base-chroot 0.1 check_installed_pkg xbps-base-chroot 0.1
[ $? -ne 0 ] && msg_error "xbps-base-chroot pkg not installed." if [ $? -ne 0 ]; then
echo "The '$pkgname' package requires to be installed in a chroot."
echo "Please install the 'xbps-base-chroot' package and try again."
exit 1
fi
if [ "$(id -u)" -ne 0 ]; then if [ "$(id -u)" -ne 0 ]; then
if [ -n "$origin_tmpl" ]; then if [ -n "$origin_tmpl" ]; then
@ -232,11 +236,9 @@ if [ "$(id -u)" -ne 0 ]; then
reset_tmpl_vars reset_tmpl_vars
run_file $XBPS_TEMPLATESDIR/$origin_tmpl.tmpl run_file $XBPS_TEMPLATESDIR/$origin_tmpl.tmpl
fi fi
if [ -z "$base_chroot" ]; then echo "The '$pkgname' package requires to be installed in a chroot."
msg_error "this package must be built inside of the chroot." echo "You cannot do this as normal user, try again being root."
else exit 1
msg_error "you must be root to use this target."
fi
fi fi
if [ ! -f $XBPS_MASTERDIR/.xbps_perms_done ]; then if [ ! -f $XBPS_MASTERDIR/.xbps_perms_done ]; then