[gentoo-commits] proj/eselect-rust:master commit in: /

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     66c4c263a0f983bfb456e43cc674a25323ea189c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 01:13:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 04:56:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-rust.git/commit/?id=66c4c263

Mark "unset" action as deprecated

As long as one Rust implementation is installed, there should be always
a Rust implementation marked as default.

However, we need to keep this function until all ebuilds which are calling
"eselect rust unset" are gone. So make this action an alias of new
cleanup action.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 rust.eselect.in | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/rust.eselect.in b/rust.eselect.in
index 1360dc2..0ecf87a 100644
--- a/rust.eselect.in
+++ b/rust.eselect.in
@@ -284,37 +284,11 @@ do_update() {
 ### unset action ###
 
 describe_unset() {
-	echo "Unset active Rust version"
-}
-
-describe_unset_options() {
-	echo "--if-invalid    : Unset only if symlink is invalid (e.g. package was uninstalled)"
+	echo 'DEPRECATED: Use "cleanup" action instead!'
 }
 
 do_unset() {
-	local if_invalid="0"
-	while [[ $# > 0 ]]; do
-		case "$1" in
-			--if-invalid)
-				if_invalid="1"
-				;;
-			*)
-				die -q "Unrecognized argument '$1'"
-				;;
-		esac
-		shift
-	done
-
-	if [[ "${if_invalid}" == "1" ]]; then
-		local missing_symlinks=( $(find_missing_broken_symlinks) )
-		if [[ ${#missing_symlinks[@]} -eq 0 ]]; then
-			return
-		else
-			echo "Not all symlinks set. Will unset current symlinked Rust binaries!"
-		fi
-	fi
-
-	unset_version || die -q "Couldn't unset active version"
+	do_cleanup
 }
 
 # vim: set ft=eselect :