From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 22 Jun 2013 06:14:35 +0000 (-0700)
Subject: emerge-delta-webrsync: clean TMPDIR more
X-Git-Tag: v2.2.0_alpha184
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fd7f9a8fd0761d3cfbb2ffa603bb71003a528735;p=portage.git

emerge-delta-webrsync: clean TMPDIR more
---

diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 85ee65605..a80c9764c 100755
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -547,6 +547,7 @@ if ! type -p patcher &> /dev/null; then
 	echo "!!!"
 	sleep 10
 	if do_latest_snapshot; then
+		rm -fr "${TMPDIR}"
 		cleanse_state_dir
 		exit 0
 	fi
@@ -597,6 +598,7 @@ done
 if [[ -z ${base_version} ]]; then
 	echo "no base found.  resorting to pulling a full version"
 	if do_latest_snapshot; then
+		rm -fr "${TMPDIR}"
 		cleanse_state_dir
 		exit 0
 	fi
@@ -661,9 +663,9 @@ if [[ -z $patches ]]; then
 		if [[ ${WEBSYNC_VERIFY_SIGNATURE} == 1 ]] ; then
 			check_file_signature "${DISTDIR}/portage-${base_date}.tar.bz2.gpgsig" "${dfile}" || exit 1
 		fi
-		sync_local "${dfile}"
+		sync_local "${dfile}" && rm -fr "${TMPDIR}"
 	else
-		:
+		rm -fr "${TMPDIR}"
 	fi
 	exit $?
 fi
@@ -699,6 +701,7 @@ if ! patcher -v "${dfile}" ${patches} "${TMPDIR}/portage-${final_date}.tar"; the
 	echo "reconstruction failed (contact the author with the error from the reconstructor please)"
 	rm -f "${TMPDIR}/portage-${final_date}.tar"
 	if do_latest_snapshot; then
+		rm -fr "${TMPDIR}"
 		cleanse_state_dir
 		exit 0
 	fi