From acd5acfa04cdc2973fa037dfd9f76c99bdea776f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 4 Oct 2009 22:11:09 +0000 Subject: [PATCH] Use _pkgsplit when input cannot contain a category. svn path=/main/trunk/; revision=14493 --- pym/portage/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1469cd961..a210492b8 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6004,7 +6004,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m mypv = os.path.basename(ebuild_path)[:-7] mycpv = cat+"/"+mypv - mysplit=pkgsplit(mypv,silent=0) + mysplit = versions._pkgsplit(mypv) if mysplit is None: raise portage.exception.IncorrectParameter( _("Invalid ebuild path: '%s'") % myebuild) @@ -8176,7 +8176,7 @@ def cpv_getkey(mycpv): % (mycpv,), DeprecationWarning) myslash = mycpv.split("/", 1) - mysplit=pkgsplit(myslash[-1]) + mysplit = versions._pkgsplit(myslash[-1]) if mysplit is None: return None mylen=len(myslash) @@ -8219,7 +8219,7 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None): virtual is a valid choice and defaults to the first element when there are no installed/available candidates.""" myslash=mycpv.split("/") - mysplit=pkgsplit(myslash[-1]) + mysplit = versions._pkgsplit(myslash[-1]) if settings is None: settings = globals()["settings"] virts = settings.getvirtuals("/") -- 2.26.2