1 |
the_paya 09/01/24 21:46:04 |
2 |
|
3 |
Modified: 1.5 1.5.4 1.5.6 |
4 |
Log: |
5 |
Updated install-sh patches from bug 196728 to fix parallel make install failures. |
6 |
|
7 |
Revision Changes Path |
8 |
1.2 eclass/ELT-patches/install-sh/1.5 |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5?rev=1.2&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5?rev=1.2&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5?r1=1.1&r2=1.2 |
13 |
|
14 |
Index: 1.5 |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ELT-patches/install-sh/1.5,v |
17 |
retrieving revision 1.1 |
18 |
retrieving revision 1.2 |
19 |
diff -u -r1.1 -r1.2 |
20 |
--- 1.5 14 Sep 2007 11:37:09 -0000 1.1 |
21 |
+++ 1.5 24 Jan 2009 21:46:04 -0000 1.2 |
22 |
@@ -1,11 +1,14 @@ |
23 |
--- install-sh 2007-07-04 14:36:49 +0100 |
24 |
+++ install-sh 2007-09-14 11:00:41 +0100 |
25 |
-@@ -192,7 +192,7 @@ |
26 |
+@@ -192,7 +192,10 @@ |
27 |
|
28 |
if [ x"$dir_arg" != x ] |
29 |
then |
30 |
- $doit $instcmd $dst && |
31 |
-+ { test -d $dst || $doit $instcmd $dst; } && |
32 |
++ { $doit $instcmd "$dst" || lasterr=$? |
33 |
++ # It's ok for mkdir to fail if the directory already exists. |
34 |
++ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
35 |
++ } && |
36 |
|
37 |
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && |
38 |
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && |
39 |
|
40 |
|
41 |
|
42 |
1.3 eclass/ELT-patches/install-sh/1.5.4 |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5.4?rev=1.3&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5.4?rev=1.3&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5.4?r1=1.2&r2=1.3 |
47 |
|
48 |
Index: 1.5.4 |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ELT-patches/install-sh/1.5.4,v |
51 |
retrieving revision 1.2 |
52 |
retrieving revision 1.3 |
53 |
diff -u -r1.2 -r1.3 |
54 |
--- 1.5.4 23 Oct 2007 11:27:11 -0000 1.2 |
55 |
+++ 1.5.4 24 Jan 2009 21:46:04 -0000 1.3 |
56 |
@@ -1,11 +1,14 @@ |
57 |
--- install-sh 2006-03-25 20:04:46 +0000 |
58 |
+++ install-sh 2007-09-14 10:53:29 +0100 |
59 |
-@@ -246,7 +246,7 @@ |
60 |
+@@ -246,7 +246,10 @@ |
61 |
fi |
62 |
|
63 |
if test -n "$dir_arg"; then |
64 |
- $doit $mkdircmd "$dst" \ |
65 |
-+ { test -d "$dst" || $doit $mkdircmd "$dst"; } \ |
66 |
++ { $doit $mkdircmd "$dst" || lasterr=$? |
67 |
++ # It's ok for mkdir to fail if the directory already exists. |
68 |
++ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
69 |
++ } \ |
70 |
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ |
71 |
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ |
72 |
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |
73 |
|
74 |
|
75 |
|
76 |
1.2 eclass/ELT-patches/install-sh/1.5.6 |
77 |
|
78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5.6?rev=1.2&view=markup |
79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5.6?rev=1.2&content-type=text/plain |
80 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/install-sh/1.5.6?r1=1.1&r2=1.2 |
81 |
|
82 |
Index: 1.5.6 |
83 |
=================================================================== |
84 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ELT-patches/install-sh/1.5.6,v |
85 |
retrieving revision 1.1 |
86 |
retrieving revision 1.2 |
87 |
diff -u -r1.1 -r1.2 |
88 |
--- 1.5.6 23 Oct 2007 11:27:11 -0000 1.1 |
89 |
+++ 1.5.6 24 Jan 2009 21:46:04 -0000 1.2 |
90 |
@@ -1,11 +1,14 @@ |
91 |
---- install-sh 2007-10-23 12:10:41 +0100 |
92 |
-+++ install-sh 2007-10-23 12:12:06 +0100 |
93 |
-@@ -240,7 +240,7 @@ |
94 |
+--- install-sh 2006-03-14 12:57:54 -0300 |
95 |
++++ install-sh 2008-06-19 22:23:04 -0300 |
96 |
+@@ -240,7 +240,10 @@ |
97 |
fi |
98 |
|
99 |
if test -n "$dir_arg"; then |
100 |
- $doit $instcmd "$dst" \ |
101 |
-+ { test -d "$dst" || $doit $instcmd "$dst"; } \ |
102 |
++ { $doit $instcmd "$dst" || lasterr=$? |
103 |
++ # It's ok for mkdir to fail if the directory already exists. |
104 |
++ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
105 |
++ } \ |
106 |
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ |
107 |
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ |
108 |
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |