From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 26 Nov 2009 14:03:06 +0000 (-0000)
Subject: don't assume ED to exist
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=73022e41c38dfaabfe139ab1c1a605dda7db38a6;p=portage.git

don't assume ED to exist

svn path=/main/branches/prefix/; revision=14894
---

diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress
index 4b269d501..396fc5664 100755
--- a/bin/ebuild-helpers/ecompress
+++ b/bin/ebuild-helpers/ecompress
@@ -53,10 +53,10 @@ case $1 in
 		;;
 	--dequeue)
 		[[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
-		find "${ED}" -name '*.ecompress.file' -print0 \
+		find "${D}" -name '*.ecompress.file' -print0 \
 			| sed -e 's:\.ecompress\.file::g' \
 			| ${XARGS} -0 ecompress
-		find "${ED}" -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
+		find "${D}" -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
 		;;
 	--*)
 		vecho "${0##*/}: unknown arguments '$*'" 1>&2
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 273de957f..301a68fb0 100755
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@ -26,10 +26,10 @@ case $1 in
 		;;
 	--dequeue)
 		[[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
-		find "${ED}" -name '*.ecompress.dir' -print0 \
+		find "${D}" -name '*.ecompress.dir' -print0 \
 			| sed -e 's:\.ecompress\.dir::g' -e "s:${ED}:/:g" \
 			| ${XARGS} -0 ecompressdir
-		find "${ED}" -name '*.ecompress.skip' -print0 | ${XARGS} -0 rm -f
+		find "${D}" -name '*.ecompress.skip' -print0 | ${XARGS} -0 rm -f
 		exit 0
 		;;
 	--*)
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 4b5902e9c..f252c14be 100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -1060,7 +1060,7 @@ preinst_aix() {
 		archive=${archive#*;}
 		archive=${archive%%;*}
 		if [[ ${archive} == *'['*']' ]]; then
-			archive=${archive%"["*}
+			archive=${archive%[*}
 			[[ ${prev_archive} == ${archive} ]] && continue
 			prev_archive=${archive}
 			archives[${#archives[@]}]=${archive#${EPREFIX}/}
@@ -1137,7 +1137,7 @@ postinst_aix() {
 		[[ ${member##*/} == *'['*']' ]] || continue
 		contentmember=${member%/*}/.${member##*/}
 		activecontentmembers="${activecontentmembers}:(${contentmember}):"
-		archive=${member%"["*}
+		archive=${member%[*}
 		[[ ${prev_archive} != ${archive} ]] || continue
 		prev_archive=${archive}
 		activearchives="${activearchives}:(${archive}):"