diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-06-25 21:50:12 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-06-25 21:50:12 +0000 |
| commit | a57665b03d5a96527bd898877d2e9db07f9948d3 (patch) | |
| tree | fb82c6c8afa6fc68f460615202983c8d300af8c3 /app-shells | |
| parent | stable x86, bug 229411 (diff) | |
| download | gentoo-2-a57665b03d5a96527bd898877d2e9db07f9948d3.tar.gz gentoo-2-a57665b03d5a96527bd898877d2e9db07f9948d3.tar.bz2 gentoo-2-a57665b03d5a96527bd898877d2e9db07f9948d3.zip | |
Move recreation of /bin/sh to pkg_preinst since reinstalling _p39 when it is recorded into contents results in a fatal error with paludis.
(Portage version: 2.1.5.6)
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/bash/bash-3.2_p39.ebuild | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index a13409c1d9f5..d3358e8f189a 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-shells/bash # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.180 2008/06/13 04:29:22 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.181 2008/06/25 21:50:12 zlin Exp $ + + 25 Jun 2008; Bo Ørsted Andresen <zlin@gentoo.org> bash-3.2_p39.ebuild: + Move recreation of /bin/sh to pkg_preinst since reinstalling _p39 when it is + recorded into contents results in a fatal error with paludis. 13 Jun 2008; Zac Medico <zmedico@gentoo.org> bash-3.2_p39.ebuild: Bug #222721 - Replace the !<sys-apps/portage-2.1.4_rc1 blocker diff --git a/app-shells/bash/bash-3.2_p39.ebuild b/app-shells/bash/bash-3.2_p39.ebuild index f64fbc97e3fe..e9e4e80fef48 100644 --- a/app-shells/bash/bash-3.2_p39.ebuild +++ b/app-shells/bash/bash-3.2_p39.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.6 2008/06/13 04:29:22 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.7 2008/06/25 21:50:12 zlin Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -182,15 +182,18 @@ pkg_preinst() { if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then rm -f "${D}"/etc/bash/bash_logout fi + + if [[ -L ${ROOT}/bin/sh ]]; then + # rewrite the symlink to ensure that its mtime changes. having /bin/sh + # missing even temporarily causes a fatal error with paludis. + local target=$(readlink "${ROOT}"/bin/sh) + ln -sf "${target}" "${ROOT}"/bin/sh + fi } pkg_postinst() { # If /bin/sh does not exist, provide it if [[ ! -e ${ROOT}/bin/sh ]]; then ln -sf bash "${ROOT}"/bin/sh - elif [[ -L ${ROOT}/bin/sh ]]; then - # rewrite the symlink to ensure that its mtime changes - local target=$(readlink "${ROOT}"/bin/sh) - ln -sf "${target}" "${ROOT}"/bin/sh fi } |