From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 12 Aug 2012 07:43:34 +0000 (+0200)
Subject: install_qa_check_prefix: drop removal of etc/{init,conf}.d files
X-Git-Tag: v2.2.0_alpha167~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=754acf1df332b3e3bda1c140c6a4d22db78b167e;p=portage.git

install_qa_check_prefix: drop removal of etc/{init,conf}.d files

This allows to use OpenRC on Prefix systems.

Signed-off-by: XU Benda <heroxbd@gmail.com>
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 18a5d55b7..ce3d68129 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -882,16 +882,6 @@ install_qa_check_prefix() {
 	# all further checks rely on ${ED} existing
 	[[ -d ${ED} ]] || return
 
-	# this does not really belong here, but it's closely tied to
-	# the code below; many runscripts generate positives here, and we
-	# know they don't work (bug #196294) so as long as that one
-	# remains an issue, simply remove them as they won't work
-	# anyway, avoid etc/init.d/functions.sh from being thrown away
-	if [[ ( -d "${ED}"/etc/conf.d || -d "${ED}"/etc/init.d ) && ! -f "${ED}"/etc/init.d/functions.sh ]] ; then
-		ewarn "removed /etc/init.d and /etc/conf.d directories until bug #196294 has been resolved"
-		rm -Rf "${ED}"/etc/{conf,init}.d
-	fi
-
 	# check shebangs, bug #282539
 	rm -f "${T}"/non-prefix-shebangs-errs
 	local WHITELIST=" /usr/bin/env "