From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAA4F138334 for ; Mon, 11 Mar 2019 05:02:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F2D1E0C37; Mon, 11 Mar 2019 05:02:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07A77E0C37 for ; Mon, 11 Mar 2019 05:02:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA6BF335D26 for ; Mon, 11 Mar 2019 05:02:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11095569 for ; Mon, 11 Mar 2019 05:02:45 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1552280181.66c4c263a0f983bfb456e43cc674a25323ea189c.whissi@gentoo> Subject: [gentoo-commits] proj/eselect-rust:master commit in: / X-VCS-Repository: proj/eselect-rust X-VCS-Files: rust.eselect.in X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 66c4c263a0f983bfb456e43cc674a25323ea189c X-VCS-Branch: master Date: Mon, 11 Mar 2019 05:02:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dcc4253c-0dee-4014-9fa4-b97916768c1e X-Archives-Hash: e079ac46b5086428ac784b5d9fc11a4e commit: 66c4c263a0f983bfb456e43cc674a25323ea189c Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Mar 11 01:13:53 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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 :