aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Stephen P. Bennett <spb@exherbo.org> 2006-04-15 20:36:49 +0000
committerAvatar Stephen P. Bennett <spb@exherbo.org> 2006-04-15 20:36:49 +0000
commit3e9740d94b127d2dbab4e99d085c89b05d03bbbd (patch)
treeba4d71d2a7a7417354832d61c817480355999d74
parent6464ef72eedc781039a7849384b5d547efddc403 (diff)
downloadpaludis-3e9740d94b127d2dbab4e99d085c89b05d03bbbd.tar.gz
paludis-3e9740d94b127d2dbab4e99d085c89b05d03bbbd.tar.xz
Remove useless debugging statements and unused CONFIG_PROTECT logic
-rw-r--r--ebuild/builtin_merge.bash14
1 files changed, 0 insertions, 14 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index c8cc04c..0c5d58e 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -36,7 +36,6 @@ builtin_merge()
echo "${!v}" > "${dbdir}"/${v} || die "pkg db write ${v} failed"
done
- echo "override cfgpro: '${PALUDIS_EBUILD_OVERRIDE_CONFIG_PROTECT}' '${PALUDIS_EBUILD_OVERRIDE_CONFIG_PROTECT_MASK}'"
if [[ -n ${PALUDIS_EBUILD_OVERRIDE_CONFIG_PROTECT} ]]; then
CONFIG_PROTECT=${PALUDIS_EBUILD_OVERRIDE_CONFIG_PROTECT}
fi
@@ -60,19 +59,6 @@ builtin_merge()
> ${dbdir}/CONTENTS
if [[ -n "${D}" ]] && [[ -d "${D}" ]] ; then
- if [[ -n "${CONFIG_PROTECT}" ]] ; then
- local d f
- for d in ${CONFIG_PROTECT} ; do
- [[ -d "${D}${d}" ]] || continue
- find "${D}${d}" -type f | \
- while read f ; do
- if [[ -e "${ROOT}${f#${D}}" ]] ; then
- echo "CONFIG_PROTECT ${f#${D}}"
- fi
- done
- done
- fi
-
install -d "${ROOT%/}/" || die "couldn't make \${ROOT} (\"${ROOT}\")"
if [[ -d "${D}" ]] ; then
${PALUDIS_EBUILD_MODULES_DIR}/utils/merge "${D%/}/" "${ROOT%/}/" "${dbdir}/CONTENTS" \