From 9e3336147d18185218716aff9c19ac4dd117c3d5 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 25 Apr 2009 08:40:48 +0000
Subject: [PATCH]    Merged from trunk -r13387:13391
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

   | 13388   | Set executable.                                              |
   | zmedico |                                                              |

   | 13389   | Add dohard and doset helper which die for EAPI 3. TODO: Make |
   | zmedico | the die helper use pipe or socket IPC instead of a signal,   |
   |         | to avoid a potential race condition in signal delivery.      |
   |         | Thanks to to Tiziano Müller <dev-zero@g.o> for the initial  |
   |         | patch.                                                       |

   | 13390   | Add dummy dosed and dohard functions for EAPI 3, so that a   |
   | zmedico | trace can be displayed (not possible with the helper         |
   |         | binaries).                                                   |

   | 13391   | Revert r13390 (dosed and dohard functions) since a stack     |
   | zmedico | trace isn't really important this particular QA feature.     |
   |         | Thanks to Tiziano Müller <dev-zero@g.o> for the suggestion. |

svn path=/main/branches/prefix/; revision=13395
---
 bin/banned-helper           |  7 +++++++
 bin/ebuild-helpers/3/dodoc  |  0
 bin/ebuild-helpers/3/dohard |  1 +
 bin/ebuild-helpers/3/dosed  |  1 +
 bin/ebuild-helpers/die      | 12 ++++++++++++
 bin/ebuild.sh               |  4 ++--
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100755 bin/banned-helper
 mode change 100644 => 100755 bin/ebuild-helpers/3/dodoc
 create mode 120000 bin/ebuild-helpers/3/dohard
 create mode 120000 bin/ebuild-helpers/3/dosed
 create mode 100755 bin/ebuild-helpers/die

diff --git a/bin/banned-helper b/bin/banned-helper
new file mode 100755
index 000000000..aa962a1f6
--- /dev/null
+++ b/bin/banned-helper
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+die "'${0##*/}' has been banned for EAPI '$EAPI'"
+exit 1
diff --git a/bin/ebuild-helpers/3/dodoc b/bin/ebuild-helpers/3/dodoc
old mode 100644
new mode 100755
diff --git a/bin/ebuild-helpers/3/dohard b/bin/ebuild-helpers/3/dohard
new file mode 120000
index 000000000..1a6b57a39
--- /dev/null
+++ b/bin/ebuild-helpers/3/dohard
@@ -0,0 +1 @@
+../../banned-helper
\ No newline at end of file
diff --git a/bin/ebuild-helpers/3/dosed b/bin/ebuild-helpers/3/dosed
new file mode 120000
index 000000000..1a6b57a39
--- /dev/null
+++ b/bin/ebuild-helpers/3/dosed
@@ -0,0 +1 @@
+../../banned-helper
\ No newline at end of file
diff --git a/bin/ebuild-helpers/die b/bin/ebuild-helpers/die
new file mode 100755
index 000000000..e871bd9fe
--- /dev/null
+++ b/bin/ebuild-helpers/die
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Eliminate race condition in signal delivery by using pipe or socket
+# IPC to guarantee that the ebuild process and all of its children (including
+# this helper) are killed immediately, ensuring that "false success" is
+# impossible.
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+die "$@"
+exit 1
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 275e27578..cee668e06 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -56,8 +56,8 @@ qa_call() {
 	return $retval
 }
 
-# subshell die support
-EBUILD_MASTER_PID=$$
+# Subshell/helper die support (must export for the die helper).
+export EBUILD_MASTER_PID=$$
 trap 'exit 1' SIGTERM
 
 EBUILD_SH_ARGS="$*"
-- 
2.26.2