diff options
| author |   Lennart Kolmodin <kolmodin@gentoo.org> | 2007-12-23 13:17:11 +0000 |
|---|---|---|
| committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2007-12-23 13:17:11 +0000 |
| commit | 92007efde708cf736cb9faec2c95e83ce0a3c52b (patch) | |
| tree | 0adea7280ef3d6c0e7d7aeb6027240531e1cde0c /dev-lang | |
| parent | Fix #199532 (diff) | |
| download | historical-92007efde708cf736cb9faec2c95e83ce0a3c52b.tar.gz historical-92007efde708cf736cb9faec2c95e83ce0a3c52b.tar.bz2 historical-92007efde708cf736cb9faec2c95e83ce0a3c52b.zip | |
Fix ghc-updater of dev-lang/ghc to solve #190043.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
| -rwxr-xr-x | dev-lang/ghc/files/ghc-updater | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index ed380714e136..0b48ebf8d922 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.146 2007/12/19 20:51:45 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.147 2007/12/23 13:17:10 kolmodin Exp $ + + 24 Dec 2007; Lennart Kolmodin <kolmodin@gentoo.org> files/ghc-updater: + Fix ghc-updater to be baselayout independent wrt functions.sh. + Fixes bug #190043, thanks to Jakub Moc <jakub@gentoo.org>. *ghc-6.8.2 (19 Dec 2007) diff --git a/dev-lang/ghc/files/ghc-updater b/dev-lang/ghc/files/ghc-updater index 622735cc9028..727089509eb6 100755 --- a/dev-lang/ghc/files/ghc-updater +++ b/dev-lang/ghc/files/ghc-updater @@ -80,11 +80,10 @@ done # load the gentoo-style info macros, but hack to get around # it thinking this is an rc script EBUILD="1" -if [[ -e /lib/rcscripts/sh/functions.sh ]]; then - source /lib/rcscripts/sh/functions.sh -else - source /sbin/functions.sh -fi + +# /etc/init.d/functions.sh always points to the correct functions.sh no +# matter which version of baselayout +source /etc/init.d/functions.sh # misc helper functions eloginfo() { |