xpak -> portage.xpak

svn path=/main/branches/prefix/; revision=5837

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 7566f366f50008d1d977fb9a0b3723840d5356d3..3b9eb877fe92daa0ca32ce9c6400603376bd3180 100644 (file)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -541,7 +541,7 @@ dyn_package() {
                die "Failed to create tarball"
        cd ..
        export PYTHONPATH=${PORTAGE_PYM_PATH:-${EPREFIX}/usr/lib/portage/pym}
-       python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
+       python -c "import portage.xpak; t=portage.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"

diff --git a/bin/quickpkg b/bin/quickpkg
index e09bd148f51e15375ac550e53016e8299fec5534..1309e8502f179d17885c524a99878d70f256e034 100755 (executable)
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -96,7 +96,7 @@ do_pkg() {
                tar vjcf "${pkg_tmp}" -C "${ROOT}" --files-from="${MYDIR}"/filelist --no-recursion
 
                # join together the basic tbz2 and the pkg info files
-               python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${MYDIR}/temp')"
+               python -c "import portage.xpak; t=portage.xpak.tbz2('${pkg_tmp}'); t.recompose('${MYDIR}/temp')"
 
                # move the final binary package to PKGDIR
                mv -f "${pkg_tmp}" "${pkg_dest}"

diff --git a/bin/xpak b/bin/xpak
index 95b15ec2072b1138424ca20709f1415d18548344..98fa10aeed6b889e4d4aaedda852cab963098a3d 100755 (executable)
--- a/bin/xpak
+++ b/bin/xpak
@@ -14,4 +14,4 @@ except ImportError:
        sys.path.insert(0, "@PORTAGE_BASE@/pym")
        import portage.xpak
 
-xpak.xpak(sys.argv[1],sys.argv[2])
+portage.xpak.xpak(sys.argv[1],sys.argv[2])