| 1 |
commit: f9d1791dbb8f61e836d1b453258502d800776bf2 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 2 04:59:07 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 2 04:59:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f9d1791d |
| 7 |
|
| 8 |
INSTALL_MASK: enable matching of broken symlinks (bug 570530) |
| 9 |
|
| 10 |
Since commit 5a1b870fe54ac06f864a648c3ea5cc118f6ce911, INSTALL_MASK |
| 11 |
does not match broken symlinks. Fix it to do so. |
| 12 |
|
| 13 |
Fixes: 5a1b870fe54a ("MEDIUM: misc-functions: Be more quiet when removing non existing INSTALL_MASK") |
| 14 |
X-Gentoo-Bug: 570530 |
| 15 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=570530 |
| 16 |
|
| 17 |
bin/misc-functions.sh | 3 ++- |
| 18 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
| 21 |
index c2ff70a..15651b9 100755 |
| 22 |
--- a/bin/misc-functions.sh |
| 23 |
+++ b/bin/misc-functions.sh |
| 24 |
@@ -275,7 +275,8 @@ install_mask() { |
| 25 |
|
| 26 |
# The standard case where $no_inst is something that |
| 27 |
# the shell could expand on its own. |
| 28 |
- if [[ -e "${root}"/${no_inst} || "${root}"/${no_inst} != $(echo "${root}"/${no_inst}) ]] ; then |
| 29 |
+ if [[ -e "${root}"/${no_inst} || -L "${root}"/${no_inst} || |
| 30 |
+ "${root}"/${no_inst} != $(echo "${root}"/${no_inst}) ]] ; then |
| 31 |
__quiet_mode || einfo "Removing ${no_inst}" |
| 32 |
rm -Rf "${root}"/${no_inst} >&/dev/null |
| 33 |
fi |
Archives