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 a4b0bc1215ce8cbf5b036c4fe93f5f40b4f2f778..bc5049fff01b117209cafb2084eabf2da37aa9b6 100644 (file)
--- 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."