Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 21 Sep 2015 08:02:07
Message-Id: 1442822506.c4290c12e46e122717586141bfa8a75dcf33220e.aballier@gentoo
1 commit: c4290c12e46e122717586141bfa8a75dcf33220e
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 21 08:01:46 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 21 08:01:46 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4290c12
7
8 eclass: texlive-common.eclass: Fix long standing bug: Do not overwrite existing symlinks.
9
10 The bug has been here since the beginning but surprisingly enough, it was only noticed now in bug #560722.
11
12 eclass/texlive-common.eclass | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
16 index e4798b3..ca0f4c6 100644
17 --- a/eclass/texlive-common.eclass
18 +++ b/eclass/texlive-common.eclass
19 @@ -85,7 +85,7 @@ texlive-common_do_symlinks() {
20 if [ $1 = $2 ];
21 then
22 einfo "Symlink $1 -> $2 skipped"
23 - elif [ -e "${ED}/usr/bin/$1" ];
24 + elif [ -e "${ED}/usr/bin/$1" -o -L "${ED}/usr/bin/$1" ];
25 then
26 einfo "Symlink $1 skipped (file exists)"
27 else