diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-08-18 16:12:33 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-18 16:12:33 -0700 |
| commit | 47bd1328435d18f5bb7e62a365a420f516816a36 (patch) | |
| tree | bc099d203d86f0145a14ad9acd887718706c7232 | |
| parent | emerge-delta-webrsync: mktemp in PORTAGE_TMPDIR (diff) | |
| download | portage-47bd1328435d18f5bb7e62a365a420f516816a36.tar.gz portage-47bd1328435d18f5bb7e62a365a420f516816a36.tar.bz2 portage-47bd1328435d18f5bb7e62a365a420f516816a36.zip | |
emerge-*webrsync: fix post_sync for prefix
| -rwxr-xr-x | bin/emerge-webrsync | 8 | ||||
| -rwxr-xr-x | misc/emerge-delta-webrsync | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 5644abfa4..fd71a1d8d 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -39,8 +39,9 @@ else eecho "could not find 'portageq'; aborting" exit 1 fi -eval $("${portageq}" envvar -v DISTDIR FEATURES FETCHCOMMAND GENTOO_MIRRORS \ - PORTAGE_BIN_PATH PORTAGE_GPG_DIR \ +eval $("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \ + FETCHCOMMAND GENTOO_MIRRORS \ + PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \ PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS \ PORTAGE_RSYNC_OPTS PORTAGE_TMPDIR PORTDIR \ SYNC USERLAND http_proxy ftp_proxy) @@ -232,7 +233,8 @@ sync_local() { vecho "Updating cache ..." emerge --metadata fi - [ -x /etc/portage/bin/post_sync ] && /etc/portage/bin/post_sync + 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 return 0 diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index 0b282d955..4eb17b7c8 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -33,7 +33,7 @@ else fi eval $("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \ FETCHCOMMAND GENTOO_MIRRORS \ - PORTAGE_BIN_PATH PORTAGE_GPG_DIR \ + PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \ PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS \ PORTAGE_RSYNC_OPTS PORTAGE_TMPDIR PORTDIR \ USERLAND http_proxy ftp_proxy) @@ -284,8 +284,8 @@ sync_local() { echo "transferring metadata/cache" emerge --metadata fi - local post_sync=/etc/portage/bin/post_sync - [[ -x "${post_sync}" ]] && ${post_sync} + local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync + [ -x "${post_sync}" ] && "${post_sync}" } fetch_from_mirrors() { |