aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-09-09 14:33:56 +0200
committerUlrich Müller <ulm@gentoo.org>2023-09-09 20:55:45 +0200
commite1a72cd47678d5202d2c7959ca6784462590c9fa (patch)
treead3f62a0ad4a76b3230821d5be4ee30dd37adbd2
parenteselect-mode: Enable lexical binding (diff)
downloadeselect-e1a72cd47678d5202d2c7959ca6784462590c9fa.tar.gz
eselect-e1a72cd47678d5202d2c7959ca6784462590c9fa.tar.bz2
eselect-e1a72cd47678d5202d2c7959ca6784462590c9fa.zip
Display only a warning when selecting an experimental profile
* 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 <ulm@gentoo.org>
-rw-r--r--ChangeLog5
-rw-r--r--modules/profile.eselect8
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 <ulm@gentoo.org>
+
+ * 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 <ulm@gentoo.org>
* 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