1 |
zmedico 08/08/19 17:51:20 |
2 |
|
3 |
Modified: ChangeLog baselayout-2.0.0.ebuild |
4 |
Log: |
5 |
Avoid potential warning messages in the SYMLINK_LIB code which may be |
6 |
triggered when find traverses a directory whose parent has already been |
7 |
merged from lib to lib64. |
8 |
(Portage version: 2.2_rc8_p11419/cvs/Linux 2.6.26-0810-x86-64 i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.470 sys-apps/baselayout/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.470&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.470&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.469&r2=1.470 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v |
20 |
retrieving revision 1.469 |
21 |
retrieving revision 1.470 |
22 |
diff -u -r1.469 -r1.470 |
23 |
--- ChangeLog 19 Aug 2008 06:12:52 -0000 1.469 |
24 |
+++ ChangeLog 19 Aug 2008 17:51:19 -0000 1.470 |
25 |
@@ -1,11 +1,16 @@ |
26 |
# ChangeLog for sys-apps/baselayout |
27 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.469 2008/08/19 06:12:52 zmedico Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.470 2008/08/19 17:51:19 zmedico Exp $ |
30 |
|
31 |
# See the rc-scripts ChangeLog in subversion for release info: |
32 |
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog |
33 |
|
34 |
19 Aug 2008; Zac Medico <zmedico@g.o> baselayout-2.0.0.ebuild: |
35 |
+ Avoid potential warning messages in the SYMLINK_LIB code which may be |
36 |
+ triggered when find traverses a directory whose parent has already been |
37 |
+ merged from lib to lib64. |
38 |
+ |
39 |
+ 19 Aug 2008; Zac Medico <zmedico@g.o> baselayout-2.0.0.ebuild: |
40 |
Make the SYMLINK_LIB code in pkg_preinst merge files from lib directories |
41 |
to lib64 directories when necessary, instead of blindly wiping out the |
42 |
content of the lib dir. Thanks to Daniel Robbins for finding the cause of |
43 |
|
44 |
|
45 |
|
46 |
1.7 sys-apps/baselayout/baselayout-2.0.0.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.7&view=markup |
49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.7&content-type=text/plain |
50 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.6&r2=1.7 |
51 |
|
52 |
Index: baselayout-2.0.0.ebuild |
53 |
=================================================================== |
54 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v |
55 |
retrieving revision 1.6 |
56 |
retrieving revision 1.7 |
57 |
diff -u -r1.6 -r1.7 |
58 |
--- baselayout-2.0.0.ebuild 19 Aug 2008 06:12:52 -0000 1.6 |
59 |
+++ baselayout-2.0.0.ebuild 19 Aug 2008 17:51:19 -0000 1.7 |
60 |
@@ -1,6 +1,6 @@ |
61 |
# Copyright 1999-2008 Gentoo Foundation |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.6 2008/08/19 06:12:52 zmedico Exp $ |
64 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.7 2008/08/19 17:51:19 zmedico Exp $ |
65 |
|
66 |
inherit multilib |
67 |
|
68 |
@@ -69,6 +69,11 @@ |
69 |
# Move directories if the dest doesn't exist. |
70 |
find "$srcdir" -type d -print0 | \ |
71 |
while read -d $'\0' src ; do |
72 |
+ |
73 |
+ # If a parent directory of $src has already |
74 |
+ # been merged then it will no longer exist. |
75 |
+ [ -d "$src" ] || continue |
76 |
+ |
77 |
dest=$destdir${src#${srcdir}} |
78 |
if [ ! -d "$dest" ] ; then |
79 |
if [ -e "$dest" ] ; then |