| 1 |
Author: grobian |
| 2 |
Date: 2009-04-25 08:40:48 +0000 (Sat, 25 Apr 2009) |
| 3 |
New Revision: 13395 |
| 4 |
|
| 5 |
Added: |
| 6 |
main/branches/prefix/bin/banned-helper |
| 7 |
main/branches/prefix/bin/ebuild-helpers/3/dohard |
| 8 |
main/branches/prefix/bin/ebuild-helpers/3/dosed |
| 9 |
main/branches/prefix/bin/ebuild-helpers/die |
| 10 |
Modified: |
| 11 |
main/branches/prefix/bin/ebuild-helpers/3/dodoc |
| 12 |
main/branches/prefix/bin/ebuild.sh |
| 13 |
Log: |
| 14 |
Merged from trunk -r13387:13391 |
| 15 |
|
| 16 |
| 13388 | Set executable. | |
| 17 |
| zmedico | | |
| 18 |
|
| 19 |
| 13389 | Add dohard and doset helper which die for EAPI 3. TODO: Make | |
| 20 |
| zmedico | the die helper use pipe or socket IPC instead of a signal, | |
| 21 |
| | to avoid a potential race condition in signal delivery. | |
| 22 |
| | Thanks to to Tiziano M?\195?\188ller <dev-zero@g.o> for the initial | |
| 23 |
| | patch. | |
| 24 |
|
| 25 |
| 13390 | Add dummy dosed and dohard functions for EAPI 3, so that a | |
| 26 |
| zmedico | trace can be displayed (not possible with the helper | |
| 27 |
| | binaries). | |
| 28 |
|
| 29 |
| 13391 | Revert r13390 (dosed and dohard functions) since a stack | |
| 30 |
| zmedico | trace isn't really important this particular QA feature. | |
| 31 |
| | Thanks to Tiziano M?\195?\188ller <dev-zero@g.o> for the suggestion. | |
| 32 |
|
| 33 |
|
| 34 |
Copied: main/branches/prefix/bin/banned-helper (from rev 13391, main/trunk/bin/banned-helper) |
| 35 |
=================================================================== |
| 36 |
--- main/branches/prefix/bin/banned-helper (rev 0) |
| 37 |
+++ main/branches/prefix/bin/banned-helper 2009-04-25 08:40:48 UTC (rev 13395) |
| 38 |
@@ -0,0 +1,7 @@ |
| 39 |
+#!/bin/bash |
| 40 |
+# Copyright 2009 Gentoo Foundation |
| 41 |
+# Distributed under the terms of the GNU General Public License v2 |
| 42 |
+# $Id$ |
| 43 |
+ |
| 44 |
+die "'${0##*/}' has been banned for EAPI '$EAPI'" |
| 45 |
+exit 1 |
| 46 |
|
| 47 |
|
| 48 |
Property changes on: main/branches/prefix/bin/ebuild-helpers/3/dodoc |
| 49 |
___________________________________________________________________ |
| 50 |
Name: svn:executable |
| 51 |
+ * |
| 52 |
|
| 53 |
Copied: main/branches/prefix/bin/ebuild-helpers/3/dohard (from rev 13391, main/trunk/bin/ebuild-helpers/3/dohard) |
| 54 |
=================================================================== |
| 55 |
--- main/branches/prefix/bin/ebuild-helpers/3/dohard (rev 0) |
| 56 |
+++ main/branches/prefix/bin/ebuild-helpers/3/dohard 2009-04-25 08:40:48 UTC (rev 13395) |
| 57 |
@@ -0,0 +1 @@ |
| 58 |
+link ../../banned-helper |
| 59 |
\ No newline at end of file |
| 60 |
|
| 61 |
Copied: main/branches/prefix/bin/ebuild-helpers/3/dosed (from rev 13391, main/trunk/bin/ebuild-helpers/3/dosed) |
| 62 |
=================================================================== |
| 63 |
--- main/branches/prefix/bin/ebuild-helpers/3/dosed (rev 0) |
| 64 |
+++ main/branches/prefix/bin/ebuild-helpers/3/dosed 2009-04-25 08:40:48 UTC (rev 13395) |
| 65 |
@@ -0,0 +1 @@ |
| 66 |
+link ../../banned-helper |
| 67 |
\ No newline at end of file |
| 68 |
|
| 69 |
Copied: main/branches/prefix/bin/ebuild-helpers/die (from rev 13391, main/trunk/bin/ebuild-helpers/die) |
| 70 |
=================================================================== |
| 71 |
--- main/branches/prefix/bin/ebuild-helpers/die (rev 0) |
| 72 |
+++ main/branches/prefix/bin/ebuild-helpers/die 2009-04-25 08:40:48 UTC (rev 13395) |
| 73 |
@@ -0,0 +1,12 @@ |
| 74 |
+#!/bin/bash |
| 75 |
+# Copyright 2009 Gentoo Foundation |
| 76 |
+# Distributed under the terms of the GNU General Public License v2 |
| 77 |
+# $Id$ |
| 78 |
+ |
| 79 |
+# TODO: Eliminate race condition in signal delivery by using pipe or socket |
| 80 |
+# IPC to guarantee that the ebuild process and all of its children (including |
| 81 |
+# this helper) are killed immediately, ensuring that "false success" is |
| 82 |
+# impossible. |
| 83 |
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh |
| 84 |
+die "$@" |
| 85 |
+exit 1 |
| 86 |
|
| 87 |
Modified: main/branches/prefix/bin/ebuild.sh |
| 88 |
=================================================================== |
| 89 |
--- main/branches/prefix/bin/ebuild.sh 2009-04-25 08:38:51 UTC (rev 13394) |
| 90 |
+++ main/branches/prefix/bin/ebuild.sh 2009-04-25 08:40:48 UTC (rev 13395) |
| 91 |
@@ -56,8 +56,8 @@ |
| 92 |
return $retval |
| 93 |
} |
| 94 |
|
| 95 |
-# subshell die support |
| 96 |
-EBUILD_MASTER_PID=$$ |
| 97 |
+# Subshell/helper die support (must export for the die helper). |
| 98 |
+export EBUILD_MASTER_PID=$$ |
| 99 |
trap 'exit 1' SIGTERM |
| 100 |
|
| 101 |
EBUILD_SH_ARGS="$*" |
Archives