From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 18 Aug 2012 23:20:06 +0000 (-0700)
Subject: emerge-*webrsync: use ${PORTAGE_BIN_PATH}/emerge
X-Git-Tag: v2.2.0_alpha122~14
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=93a42092db6209842fc2460f3ea7760bb62a7d55;p=portage.git

emerge-*webrsync: use ${PORTAGE_BIN_PATH}/emerge
---

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index fd71a1d8d..11d608ff6 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -231,12 +231,12 @@ sync_local() {
 
 	if has metadata-transfer ${FEATURES} ; then
 		vecho "Updating cache ..."
-		emerge --metadata
+		"${PORTAGE_BIN_PATH}/emerge" --metadata
 	fi
 	local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync
 	[ -x "${post_sync}" ] && "${post_sync}"
 	# --quiet suppresses output if there are no relevant news items
-	has news ${FEATURES} && emerge --check-news --quiet
+	has news ${FEATURES} && "${PORTAGE_BIN_PATH}/emerge" --check-news --quiet
 	return 0
 }
 
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 4eb17b7c8..874c52719 100755
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -281,11 +281,13 @@ sync_local() {
 		rm -rf portage
 	fi
 	if has metadata-transfer ${FEATURES} ; then
-		echo "transferring metadata/cache"
-		emerge --metadata
+		echo "Updating cache ..."
+		"${PORTAGE_BIN_PATH}/emerge" --metadata
 	fi
 	local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync
 	[ -x "${post_sync}" ] && "${post_sync}"
+	# --quiet suppresses output if there are no relevant news items
+	has news ${FEATURES} && "${PORTAGE_BIN_PATH}/emerge" --check-news --quiet
 }
 
 fetch_from_mirrors() {