1 |
mgorny 13/05/24 17:42:06 |
2 |
|
3 |
Modified: ChangeLog multibuild.eclass |
4 |
Log: |
5 |
Fix the race condition in locking code by using $BASHPID instead of $$. |
6 |
|
7 |
Revision Changes Path |
8 |
1.837 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.837&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.837&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.836&r2=1.837 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.836 |
18 |
retrieving revision 1.837 |
19 |
diff -u -r1.836 -r1.837 |
20 |
--- ChangeLog 23 May 2013 20:19:28 -0000 1.836 |
21 |
+++ ChangeLog 24 May 2013 17:42:05 -0000 1.837 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.836 2013/05/23 20:19:28 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.837 2013/05/24 17:42:05 mgorny Exp $ |
27 |
+ |
28 |
+ 24 May 2013; Michał Górny <mgorny@g.o> multibuild.eclass: |
29 |
+ Fix the race condition in locking code by using $BASHPID instead of $$. |
30 |
|
31 |
23 May 2013; Michał Górny <mgorny@g.o> multibuild.eclass: |
32 |
Use portable locking code from Fabian Groffen. Bug #466554. |
33 |
|
34 |
|
35 |
|
36 |
1.11 eclass/multibuild.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?rev=1.11&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?rev=1.11&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?r1=1.10&r2=1.11 |
41 |
|
42 |
Index: multibuild.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v |
45 |
retrieving revision 1.10 |
46 |
retrieving revision 1.11 |
47 |
diff -u -r1.10 -r1.11 |
48 |
--- multibuild.eclass 23 May 2013 20:19:28 -0000 1.10 |
49 |
+++ multibuild.eclass 24 May 2013 17:42:05 -0000 1.11 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.10 2013/05/23 20:19:28 mgorny Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.11 2013/05/24 17:42:05 mgorny Exp $ |
55 |
|
56 |
# @ECLASS: multibuild |
57 |
# @MAINTAINER: |
58 |
@@ -252,7 +252,7 @@ |
59 |
local dest=${2} |
60 |
|
61 |
local lockfile=${T}/.multibuild_merge_lock |
62 |
- local lockfile_l=${lockfile}.${$} |
63 |
+ local lockfile_l=${lockfile}.${BASHPID} |
64 |
local ret |
65 |
|
66 |
# Lock the install tree for merge. The touch+ln method ensures race |