From 16808930aa9cbfccbfce56f85996f667e399de47 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 23 Nov 2009 02:12:38 +0000 Subject: [PATCH] xbps-src/shutils: remove unused $origin_tmpl stuff. --HG-- extra : convert_revision : de50b832bdd8fc64c1a94856248e749eafac84c9 --- xbps-src/shutils/chroot.sh | 7 +------ xbps-src/shutils/pkgtarget_funcs.sh | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/xbps-src/shutils/chroot.sh b/xbps-src/shutils/chroot.sh index f1702e156b..2fa33c44ab 100644 --- a/xbps-src/shutils/chroot.sh +++ b/xbps-src/shutils/chroot.sh @@ -281,12 +281,7 @@ if [ $? -ne 0 ]; then fi if [ "$(id -u)" -ne 0 ]; then - if [ -n "$origin_tmpl" ]; then - . $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 "This package requires to be installed in a chroot." echo "You cannot do this as normal user, try again being root." exit 1 fi diff --git a/xbps-src/shutils/pkgtarget_funcs.sh b/xbps-src/shutils/pkgtarget_funcs.sh index 7fab2d83ae..95f513d4da 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh +++ b/xbps-src/shutils/pkgtarget_funcs.sh @@ -48,12 +48,6 @@ install_pkg() setup_tmpl $curpkgn 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 . $XBPS_SHUTILSDIR/chroot.sh [ -n "$install_destdir_target" ] && cdestdir=yes