From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 9 Mar 2007 21:03:25 +0000 (-0000)
Subject: import portage.xpak to avoid deprecation warning
X-Git-Tag: v2.2_pre1~1588
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f97da4a44583dc747043f0b973adca167051ba4;p=portage.git

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 2a6013863..c5e74dff4 100755
--- 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"