summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-05-28 23:41:13 +0000
committerZac Medico <zmedico@gentoo.org>2007-05-28 23:41:13 +0000
commitf80190b8492047950b3d8096e8a41a32fa97353e (patch)
treeed11cc548db97f752d40bfb94f91333e6516fcee
parentcb6cc34cc5b9f7783de1c8c99336738ebb0a28d5 (diff)
downloadportage-f80190b8492047950b3d8096e8a41a32fa97353e.tar.gz
portage-f80190b8492047950b3d8096e8a41a32fa97353e.tar.bz2
portage-f80190b8492047950b3d8096e8a41a32fa97353e.zip
Fix binarytree.gettbz2() so that it works without $PKGDIR/All/ and inserts the downloaded package into the local index.
svn path=/main/trunk/; revision=6656
-rw-r--r--pym/portage/dbapi/bintree.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 0589c75b8..ab4b88ae9 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -743,14 +743,16 @@ class binarytree(object):
else:
writemsg("Resuming download of this tbz2, but it is possible that it is corrupt.\n",
noiselevel=-1)
- mydest = self.pkgdir + "/All/"
+ mydest = os.path.dirname(self.getname(pkgname))
try:
os.makedirs(mydest, 0775)
except (OSError, IOError):
pass
- return portage.getbinpkg.file_get(
+ success = portage.getbinpkg.file_get(
self.settings["PORTAGE_BINHOST"] + "/" + tbz2name,
mydest, fcmd=self.settings["RESUMECOMMAND"])
+ self.inject(pkgname)
+ return success
def getslot(self, mycatpkg):
"Get a slot for a catpkg; assume it exists."