import portage.xpak to avoid deprecation warning

svn path=/main/trunk/; revision=6202

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 2a60138635d110ecd53acfad55641c2336ead20a..c5e74dff4a40820e3ba86af387603a9b0990b02e 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -515,8 +515,8 @@ dyn_package() {
        tar ${tar_options} -cf - . | bzip2 -f > "${pkg_tmp}" || \
                die "Failed to create tarball"
        cd ..
-       export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
-       python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
+       export PYTHONPATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}:${PYTHONPATH}"
+       python -c "from portage import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
        if [ $? -ne 0 ]; then
                rm -f "${pkg_tmp}"
                die "Failed to append metadata to the tbz2 file"