[gentoo-commits] repo/gentoo:master commit in: eclass/

[Alexis Ballier]

commit:     c4290c12e46e122717586141bfa8a75dcf33220e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 08:01:46 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 08:01:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4290c12

eclass: texlive-common.eclass: Fix long standing bug: Do not overwrite existing 
symlinks.

The bug has been here since the beginning but surprisingly enough, it was only 
noticed now in bug #560722.

 eclass/texlive-common.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
index e4798b3..ca0f4c6 100644
--- a/eclass/texlive-common.eclass
+++ b/eclass/texlive-common.eclass
@@ -85,7 +85,7 @@ texlive-common_do_symlinks() {
                                if [ $1 = $2 ];
                                then
                                        einfo "Symlink $1 -> $2 skipped"
-                               elif [ -e "${ED}/usr/bin/$1" ];
+                               elif [ -e "${ED}/usr/bin/$1" -o -L 
"${ED}/usr/bin/$1" ];
                                then
                                        einfo "Symlink $1 skipped (file exists)"
                                else