diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-08-19 17:51:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-19 17:51:19 +0000 |
| commit | e6baab57a9006bb0f10ad3338358fae9b50d200e (patch) | |
| tree | 851c541ea3d477db3f511b4cfec379a47e63195a /sys-apps/baselayout | |
| parent | Stable on sparc, bug #235028 (diff) | |
| download | historical-e6baab57a9006bb0f10ad3338358fae9b50d200e.tar.gz historical-e6baab57a9006bb0f10ad3338358fae9b50d200e.tar.bz2 historical-e6baab57a9006bb0f10ad3338358fae9b50d200e.zip | |
Avoid potential warning messages in the SYMLINK_LIB code which may be
triggered when find traverses a directory whose parent has already been
merged from lib to lib64.
Package-Manager: portage-2.2_rc8_p11419/cvs/Linux 2.6.26-0810-x86-64 i686
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.0.0.ebuild | 7 |
3 files changed, 17 insertions, 7 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 53985ce49e58..b0ab0ddd9f30 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.469 2008/08/19 06:12:52 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.470 2008/08/19 17:51:19 zmedico Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog 19 Aug 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild: + Avoid potential warning messages in the SYMLINK_LIB code which may be + triggered when find traverses a directory whose parent has already been + merged from lib to lib64. + + 19 Aug 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild: Make the SYMLINK_LIB code in pkg_preinst merge files from lib directories to lib64 directories when necessary, instead of blindly wiping out the content of the lib dir. Thanks to Daniel Robbins for finding the cause of diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 56f118e49efc..46fa1e08fd2c 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -11,13 +11,13 @@ DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779 EBUILD baselayout-1.11.15-r3.ebuild 18810 RMD160 70a6adf906ecc25c47084b99d10bd2885da5c4fc SHA1 fd25e055fc06493f265f193e92bbcb02c8809f0a SHA256 7121667401fd361ea636880fd3d29dcb876aff313f14f298e1da4bb8d8ff7660 EBUILD baselayout-1.12.11.1.ebuild 19431 RMD160 f9a9ea6cd713286d16cea13e7a1e43e5b8197026 SHA1 29487a6939425dbc744681b24c0590683ea9267d SHA256 524fced8a4667878dbefa37628b32075623b10cc2f9809dd9b40b8d3cc0e4dff EBUILD baselayout-1.12.12.ebuild 19417 RMD160 07c5ad50dc02dde2806f2eeed0c165055ca76048 SHA1 08690a566a6b2e13c05254758d75e24f297d2e0f SHA256 fc74698d50dfd8eb3679137b68bada1d3d9c01acec46473e31f92b4d16e5febe -EBUILD baselayout-2.0.0.ebuild 7054 RMD160 db10a80c700f87377667bbfbf63b5d92e1770651 SHA1 cf86c49347efe7d9ac549667bc02fad403fa08bd SHA256 eb83dea307699036df66fc1db345be7e2bd83ed82774c217ba470b0403700f6e -MISC ChangeLog 101844 RMD160 1835ba0331267ea78e2c933df545861d125cdf7c SHA1 a58a8801b6cc406f68c92ba058f423b472a67862 SHA256 9a5f524b93224339b946b3793859749683dcc41fc68c6288feeeeb1e3bd408f9 +EBUILD baselayout-2.0.0.ebuild 7188 RMD160 06f6b52c63e424a420c857b9fd835a6c11acfe82 SHA1 a0c8c8fb3ccc32ffaaa760186dd174d317c3ef8f SHA256 cf8ad7041bb21c9fc6f79d81f3d9f39c1f63f46b6bcea97dc86c597eaf3106c0 +MISC ChangeLog 102091 RMD160 7497baad285cfd261ddcd25a8d7352176220174e SHA1 94f770374617753d248fb123f21cda577f3feab7 SHA256 be476c3a2ef35600ab964d063e4883a6c112bb60f8a5009b44f5e29228c4f6de MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkiqZHEACgkQ/ejvha5XGaNhuACg3Wk84S8ZhbaxfKdqdNGPbHKD -neYAoMPLSZ3C5SNG5Hd3YD/NmGPwh3Dh -=d59q +iEYEARECAAYFAkirCCYACgkQ/ejvha5XGaPxWgCg78Jcz2yO4x/axFeKA9ZlgW6h +Wh8AoL3/gNcDFUhOPcj+HqTnq6T08ZfK +=1EgZ -----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-2.0.0.ebuild b/sys-apps/baselayout/baselayout-2.0.0.ebuild index c2c1991d229e..926409d53a04 100644 --- a/sys-apps/baselayout/baselayout-2.0.0.ebuild +++ b/sys-apps/baselayout/baselayout-2.0.0.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/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.6 2008/08/19 06:12:52 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.7 2008/08/19 17:51:19 zmedico Exp $ inherit multilib @@ -69,6 +69,11 @@ pkg_preinst() { # Move directories if the dest doesn't exist. find "$srcdir" -type d -print0 | \ while read -d $'\0' src ; do + + # If a parent directory of $src has already + # been merged then it will no longer exist. + [ -d "$src" ] || continue + dest=$destdir${src#${srcdir}} if [ ! -d "$dest" ] ; then if [ -e "$dest" ] ; then |