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

xbps-src/shutils: remove unused $origin_tmpl stuff.

Browse source 
--HG--
extra : convert_revision : de50b832bdd8fc64c1a94856248e749eafac84c9
This commit is contained in:
Juan RP 2009-11-23 02:12:38 +00:00
parent 38496b3618
commit 16808930aa
2 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xbps-src/shutils/chroot.sh
View file

@ -281,12 +281,7 @@ if [ $? -ne 0 ]; then
fi fi
if [ "$(id -u)" -ne 0 ]; then if [ "$(id -u)" -ne 0 ]; then
if [ -n "$origin_tmpl" ]; then echo "This package requires to be installed in a chroot."
. $XBPS_SHUTILSDIR/tmpl_funcs.sh
reset_tmpl_vars
cd ../$origin_tmpl && . template
fi
echo "The '$pkgname' package requires to be installed in a chroot."
echo "You cannot do this as normal user, try again being root." echo "You cannot do this as normal user, try again being root."
exit 1 exit 1
fi fi

6
xbps-src/shutils/pkgtarget_funcs.sh
View file

@ -48,12 +48,6 @@ install_pkg()
setup_tmpl $curpkgn setup_tmpl $curpkgn
fi fi
#
# If we are the originator package save the path for this template in
# other var for future use.
#
[ -z "$origin_tmpl" ] && origin_tmpl=$pkgname
if [ -z "$base_chroot" -a -z "$in_chroot" ]; then if [ -z "$base_chroot" -a -z "$in_chroot" ]; then
. $XBPS_SHUTILSDIR/chroot.sh . $XBPS_SHUTILSDIR/chroot.sh
[ -n "$install_destdir_target" ] && cdestdir=yes [ -n "$install_destdir_target" ] && cdestdir=yes