[gentoo-commits] proj/portage:master commit in: bin/

[Zac Medico]

commit:     f9d1791dbb8f61e836d1b453258502d800776bf2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 04:59:07 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 04:59:28 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f9d1791d

INSTALL_MASK: enable matching of broken symlinks (bug 570530)

Since commit 5a1b870fe54ac06f864a648c3ea5cc118f6ce911, INSTALL_MASK
does not match broken symlinks. Fix it to do so.

Fixes: 5a1b870fe54a ("MEDIUM: misc-functions: Be more quiet when removing non 
existing INSTALL_MASK")
X-Gentoo-Bug: 570530
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=570530

 bin/misc-functions.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index c2ff70a..15651b9 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -275,7 +275,8 @@ install_mask() {
 
                # The standard case where $no_inst is something that
                # the shell could expand on its own.
-               if [[ -e "${root}"/${no_inst} || "${root}"/${no_inst} != $(echo 
"${root}"/${no_inst}) ]] ; then
+               if [[ -e "${root}"/${no_inst} || -L "${root}"/${no_inst} ||
+                       "${root}"/${no_inst} != $(echo "${root}"/${no_inst}) ]] 
; then
                        __quiet_mode || einfo "Removing ${no_inst}"
                        rm -Rf "${root}"/${no_inst} >&/dev/null
                fi