[gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/

[Richard Farina]

commit:     1447a3491e8a5e88580692afc2a38e205e6efd2f
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  4 17:38:50 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 17:38:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1447a349

missed the definition of depclean by a tiny bit

 targets/livecd-stage2/livecd-stage2-controller.sh | 2 +-
 targets/support/depclean.sh                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh 
b/targets/livecd-stage2/livecd-stage2-controller.sh
index 2f0af1f9..5834c837 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -187,7 +187,7 @@ case $1 in
                ;;
 
        unmerge)
-               [ "${clst_depclean}" != "no" ] && exec_in_chroot 
${clst_shdir}/support/depclean.sh
+               [ "${clst_livecd_depclean}" != "no" ] && exec_in_chroot 
${clst_shdir}/support/depclean.sh
                shift
                export clst_packages="$*"
                exec_in_chroot ${clst_shdir}/support/unmerge.sh

diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
index b3640958..56f9a669 100755
--- a/targets/support/depclean.sh
+++ b/targets/support/depclean.sh
@@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh
 
 # If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
 [ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
-if [ "${clst_depclean}" = "keepbdeps" ]; then
+if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then
        run_merge --depclean --with-bdeps=y
 else
        run_merge --depclean --with-bdeps=n