From e1a72cd47678d5202d2c7959ca6784462590c9fa Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sat, 9 Sep 2023 14:33:56 +0200 Subject: Display only a warning when selecting an experimental profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * modules/profile.eselect (set_symlink): Selecting an experimental profile without --force is no longer a fatal error. Bug 913480. Bug: https://bugs.gentoo.org/913480 Signed-off-by: Ulrich Müller --- ChangeLog | 5 +++++ modules/profile.eselect | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ee3f7..71ce655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2023-09-09 Ulrich Müller + + * modules/profile.eselect (set_symlink): Selecting an experimental + profile without --force is no longer a fatal error. Bug 913480. + 2023-08-24 Ulrich Müller * misc/eselect-mode.el: Enable lexical binding. diff --git a/modules/profile.eselect b/modules/profile.eselect index f33f8d1..31b2c6a 100644 --- a/modules/profile.eselect +++ b/modules/profile.eselect @@ -1,5 +1,5 @@ # -*-eselect-*- vim: ft=eselect -# Copyright 2005-2022 Gentoo Authors +# Copyright 2005-2023 Gentoo Authors # Distributed under the terms of the GNU GPL version 2 or later # This is a portage-only module. @@ -88,10 +88,8 @@ set_symlink() { repopath=${target%%::*}; target=${target#*::} status=${target#*::}; status=${status%%::*} target=${target%%::*} - if [[ ${status} == exp && -z ${force} ]]; then - write_error_msg "Profile ${target} is experimental" - die -q "Refusing to select ${status} profile without --force option" - fi + [[ ${status} == exp ]] \ + && write_warning_msg "Profile ${target} is experimental" elif [[ -n ${target} ]]; then # if the profile was explicitly specified (rather than a number) # double check and make sure it's valid -- cgit v1.2.3-65-gdbad