1 |
commit: 1447a3491e8a5e88580692afc2a38e205e6efd2f |
2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 4 17:38:50 2018 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 4 17:38:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1447a349 |
7 |
|
8 |
missed the definition of depclean by a tiny bit |
9 |
|
10 |
targets/livecd-stage2/livecd-stage2-controller.sh | 2 +- |
11 |
targets/support/depclean.sh | 2 +- |
12 |
2 files changed, 2 insertions(+), 2 deletions(-) |
13 |
|
14 |
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh |
15 |
index 2f0af1f9..5834c837 100755 |
16 |
--- a/targets/livecd-stage2/livecd-stage2-controller.sh |
17 |
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh |
18 |
@@ -187,7 +187,7 @@ case $1 in |
19 |
;; |
20 |
|
21 |
unmerge) |
22 |
- [ "${clst_depclean}" != "no" ] && exec_in_chroot ${clst_shdir}/support/depclean.sh |
23 |
+ [ "${clst_livecd_depclean}" != "no" ] && exec_in_chroot ${clst_shdir}/support/depclean.sh |
24 |
shift |
25 |
export clst_packages="$*" |
26 |
exec_in_chroot ${clst_shdir}/support/unmerge.sh |
27 |
|
28 |
diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh |
29 |
index b3640958..56f9a669 100755 |
30 |
--- a/targets/support/depclean.sh |
31 |
+++ b/targets/support/depclean.sh |
32 |
@@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh |
33 |
|
34 |
# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them. |
35 |
[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs" |
36 |
-if [ "${clst_depclean}" = "keepbdeps" ]; then |
37 |
+if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then |
38 |
run_merge --depclean --with-bdeps=y |
39 |
else |
40 |
run_merge --depclean --with-bdeps=n |