aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Marineau <mike@marineau.org>2013-11-13 17:55:18 -0800
committerUlrich Müller <ulm@gentoo.org>2013-11-14 12:49:09 +0100
commite85c43aa6c5aba6d17b509065306c72fae42485e (patch)
tree916c0a70197700d714d55fa5febb61eec35f3d5a
parentImplement space function more efficiently. (diff)
downloadeselect-e85c43aa6c5aba6d17b509065306c72fae42485e.tar.gz
eselect-e85c43aa6c5aba6d17b509065306c72fae42485e.tar.bz2
eselect-e85c43aa6c5aba6d17b509065306c72fae42485e.zip
Silence profile symlink warning when using --force, bug 491216.
When building packages in an alternate ROOT that doesn't need to be perfectly configured as a stand-alone system it is reasonable for PORTDIR to be shared with the host system and not inside of ROOT. Also when using eselect in automated scripts (to take advantage of repo_name:foo/profile/path parsing) it feels clunky to have to emit "Please ignore the following warning" messages to avoid scaring people.
-rw-r--r--ChangeLog5
-rw-r--r--modules/profile.eselect1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 31418dd..89fe111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-14 Michael Marineau <mike@marineau.org>
+
+ * modules/profile.eselect (set_symlink): Silence profile symlink
+ warning when using --force, bug 491216.
+
2013-11-10 Ulrich Müller <ulm@gentoo.org>
* libs/output.bash.in (space): Implement more efficiently.
diff --git a/modules/profile.eselect b/modules/profile.eselect
index a91a45f..77533ea 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -122,6 +122,7 @@ set_symlink() {
|| die -q "Couldn't set new ${MAKE_PROFILE} symlink"
# check if the resulting symlink is sane
[[ $(canonicalise "${MAKE_PROFILE}") != "$(canonicalise "${EROOT}")"/* ]] \
+ && [[ -z ${force} ]] \
&& write_warning_msg "Strange path. Check ${MAKE_PROFILE} symlink"
return 0