commit:     167f0040d0ea65194056b85602c46a098168ea26
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 19:57:47 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 19:57:47 2024 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=167f0040

Warn about deprecated make.profile location

* modules/profile.eselect (get_symlink_location): Warn about
deprecated /etc/make.profile location.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog               | 3 +++
 modules/profile.eselect | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf6b092..5764686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2024-11-13  Ulrich Müller  <u...@gentoo.org>
 
+       * modules/profile.eselect (get_symlink_location): Warn about
+       deprecated /etc/make.profile location.
+
        * misc/eselect-mode.el (eselect-mode-keywords-*): Delete.
        (eselect-mode-keywords-0): Combine keywords in one variable.
        (eselect-mode-font-lock-keywords): Use the new variable.

diff --git a/modules/profile.eselect b/modules/profile.eselect
index 31b2c6a..8c74dd9 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2023 Gentoo Authors
+# Copyright 2005-2024 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 # This is a portage-only module.
@@ -20,9 +20,11 @@ get_symlink_location() {
        if [[ -e ${oldloc} ]]; then
                if [[ -e ${newloc} ]]; then
                        write_warning_msg "Both ${oldloc} and ${newloc} exist."
-                       write_warning_msg "Using ${MAKE_PROFILE}."
+                       write_warning_msg "Using ${newloc}."
                else
                        MAKE_PROFILE=${oldloc}
+                       write_warning_msg "Deprecated location ${oldloc}."
+                       write_warning_msg "The profile symlink should be at 
${newloc}."
                fi
        fi
 }

Reply via email to