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 | 2feecfcfdf19e3267cda201fc1fa125257d5c2a3 (patch) | |
| tree | 1daaf66882224b7787bfcbcea6dbd3221d0ca1bc /app-shells | |
| parent | stable x86, bug 229411 (diff) | |
| download | historical-2feecfcfdf19e3267cda201fc1fa125257d5c2a3.tar.gz historical-2feecfcfdf19e3267cda201fc1fa125257d5c2a3.tar.bz2 historical-2feecfcfdf19e3267cda201fc1fa125257d5c2a3.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.
Package-Manager: portage-2.1.5.6
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/bash/Manifest | 10 | ||||
| -rw-r--r-- | app-shells/bash/bash-3.2_p39.ebuild | 13 |
3 files changed, 18 insertions, 11 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/Manifest b/app-shells/bash/Manifest index 7145bcf24ac7..20a3df627dd5 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -150,13 +150,13 @@ EBUILD bash-3.0-r14.ebuild 4724 RMD160 8c16b1f563c0eb4d2c752141d9575c24c437a398 EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e SHA1 c00fd85917ace93b4d1bdaf6db18224e08260834 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8 EBUILD bash-3.2_p17-r1.ebuild 5190 RMD160 9c45f94ce82653ca2d45a322f589ff559c38e6ee SHA1 263691afc042bf469ab864fdf4d78ecfca2ce444 SHA256 339157453d9df410d882e72ea22eac12e62ee176ef013e7570135a3c1b959eab EBUILD bash-3.2_p33.ebuild 5653 RMD160 3033b2fd6068ab34362ea14ec90bc173e29343f3 SHA1 07a746960852d88592cee6874d53272cb720e31e SHA256 e8bb4d859e1ab631e9816d646b63ab19fbcce905d12ebceaf419beba5fae77f2 -EBUILD bash-3.2_p39.ebuild 6072 RMD160 3f8ca6d4a1de103a6a1f1bd4cbaef50a1a1ea78e SHA1 d9719ca98a80dd4469e5fbeb997dc5605be6ae80 SHA256 43405bd3695984e7f8b6861b66ffb494c51a3208d605095a69b9d108a759dfc9 -MISC ChangeLog 29561 RMD160 d5cc1dbcceca23c265fc4fff3b8c06f1e909a9b5 SHA1 607dde442907528a3541b67d0bd223ddac7b32ec SHA256 cdfcc5f3e4700df752738fbaf34ff7774e398dea3bcf515c43a82a886e3c676d +EBUILD bash-3.2_p39.ebuild 6152 RMD160 487627c9e63bbc838eba3064f4bd17ca5b9dfaf7 SHA1 e5b8f99505ccc619ccf53ed38f16c1593c6ec73c SHA256 4d28f39d597311398a42dfb2ff418924187f78ad4cab9008cf150ab0d63f6795 +MISC ChangeLog 29776 RMD160 94e979ba14b52e5a095b5f88558e5c53fa8be9f5 SHA1 7d6a4655ec04e1f830655e8822ef515a3fbd9c59 SHA256 cf0f9170ae36dda49ed0faefb6a543a7fe26db130ab8449ab49dcaa334f36a59 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkhR950ACgkQ/ejvha5XGaO45gCeO7kDwKP4Vl6bWm2yL5i9JOGd -+s8AoI8An5uS5ODAoXt5x2vKJ//obufu -=jQRO +iEYEARECAAYFAkhi2cAACgkQfxJ68Jl1NeHJHgCgg+rc+4hdeLRjMuHVTNRh+TY/ +/RQAnjrhvRcI2peC2tCAuMYXDprm4rHs +=8r01 -----END PGP SIGNATURE----- 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 } |