From: Fabian Groffen Date: Sun, 15 Oct 2006 07:28:29 +0000 (-0000) Subject: merge with trunk 4703:4704 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=750b14ef6a67055d662c441319795b5f549f67ed;p=portage.git merge with trunk 4703:4704 Simplify binarytree.getname(). svn path=/main/branches/prefix/; revision=4705 --- diff --git a/pym/portage.py b/pym/portage.py index a4b0bc121..bc5049fff 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5642,11 +5642,8 @@ class binarytree(packagetree): def getname(self,pkgname): "returns file location for this particular package" - mysplit=string.split(pkgname,"/") - if len(mysplit)==1: - return self.pkgdir+"/All/"+self.resolve_specific(pkgname)+".tbz2" - else: - return self.pkgdir+"/All/"+mysplit[1]+".tbz2" + return os.path.join(self.pkgdir, + "All", catsplit(pkgname)[1] + ".tbz2") def isremote(self,pkgname): "Returns true if the package is kept remotely."