--- emerge-delta-webrsync-3.5.1_old 2006-08-07 20:54:08.000000000 +0200 +++ emerge-delta-webrsync-3.5.1 2006-08-07 21:00:37.000000000 +0200 @@ -8,10 +8,11 @@ #initialization #------------------ -f=$(python -c'import portage; print "|".join([portage.settings[x] for x in ("PORTAGE_NICENESS", "GENTOO_MIRRORS", "PORTDIR", "FETCHCOMMAND", "USERLAND", "DISTDIR", "PORTAGE_TMPDIR")])') +f=$(python -c'import portage; print "|".join([portage.settings[x] for x in ("PORTAGE_NICENESS", "FEATURES", "GENTOO_MIRRORS", "PORTDIR", "FETCHCOMMAND", "USERLAND", "DISTDIR", "PORTAGE_TMPDIR")])') IFS='|' PORTAGE_NICENESS="${f%%|*}"; f="${f#*|}" +FEATURES="${f%%|*}" ; f="${f#*|}" GENTOO_MIRRORS="${f%%|*}" ; f="${f#*|}" PORTDIR="${f%%|*}" ; f="${f#*|}" FETCHCOMMAND="${f%%|*}" ; f="${f#*|}" @@ -20,6 +21,8 @@ TMPDIR="${f%%|*}/snapshots" unset IFS +source /usr/lib/portage/bin/isolated-functions.sh || exit 1 + if [ -z "$NICENESS_PULLED" ]; then if [ -n "${PORTAGE_NICENESS}" ]; then export NICENESS_PULLED=asdf @@ -217,8 +220,10 @@ echo "cleaning up" rm -rf portage fi - echo "transferring metadata/cache" - emerge metadata + if has metadata-transfer ${FEATURES} ; then + echo "transferring metadata/cache" + emerge --metadata + fi } fetch_from_mirrors() {