From 779a9e686d89e31af43e33b1163b01aeff65d7ea Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 24 Sep 2014 09:47:58 -0700 Subject: [PATCH] emerge-webrsync: fix bug #523494 Use PATH instead of PORTAGE_BIN_PATH to locate emerge. Fixes: 0cc4c1ac21a2 ("Install Portage using setup.py") X-Gentoo-Bug: 523494 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=523494 --- bin/emerge-webrsync | 4 ++-- misc/emerge-delta-webrsync | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 2f0689c..2443c2d 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -249,12 +249,12 @@ sync_local() { if has metadata-transfer ${FEATURES} ; then __vecho "Updating cache ..." - "${PORTAGE_BIN_PATH}/emerge" --metadata + 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 + has news ${FEATURES} && emerge --check-news --quiet return 0 } diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index 96564af..a412ac8 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -338,12 +338,12 @@ sync_local() { if has metadata-transfer ${FEATURES} ; then __vecho "Updating cache ..." - "${PORTAGE_BIN_PATH}/emerge" --metadata + 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 + has news ${FEATURES} && emerge --check-news --quiet return 0 } -- 1.8.5.5