From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 24 Apr 2009 02:18:34 +0000 (-0000)
Subject: Add dohard and doset helper which die for EAPI 3. TODO: Make the die
X-Git-Tag: v2.2_rc32~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f7b2df6fbe0685c3189f0c62ce92c845dbee7e2;p=portage.git

Add dohard and doset helper which die for EAPI 3. TODO: Make 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.

svn path=/main/trunk/; revision=13389
---

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/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 5f78c8e41..9cbd748e6 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="$*"