emerge-*webrsync: use ${PORTAGE_BIN_PATH}/emerge
authorZac Medico <zmedico@gentoo.org>
Sat, 18 Aug 2012 23:20:06 +0000 (16:20 -0700)
committerZac Medico <zmedico@gentoo.org>
Sat, 18 Aug 2012 23:20:06 +0000 (16:20 -0700)
bin/emerge-webrsync
misc/emerge-delta-webrsync

index fd71a1d8dd26233ae1eeb5e213f947160866a193..11d608ff69a15fc2ed6fccb5f7d72204421ecb6a 100755 (executable)
@@ -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
 }
 
index 4eb17b7c80d74c22025604baf329378df5d0443d..874c52719e1e64f255210282f03d86654208704c 100755 (executable)
@@ -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() {