From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 28 May 2007 23:41:13 +0000 (-0000)
Subject: Fix binarytree.gettbz2() so that it works without $PKGDIR/All/ and inserts the downlo... 
X-Git-Tag: v2.2_pre1~1346
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f80190b8492047950b3d8096e8a41a32fa97353e;p=portage.git

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
---

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."