diff options
-rwxr-xr-x | bin/emerge | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index a22aa6b7b..cfe84bdb8 100755 --- a/bin/emerge +++ b/bin/emerge @@ -608,7 +608,7 @@ class search: self.portdb.xmatch("match-all",match)) else: full_package = match - match = portage.pkgsplit(match)[0] + match = portage.cpv_getkey(match) if full_package: try: @@ -3696,7 +3696,8 @@ class depgraph: myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd p.append(myprint) - mysplit = portage.pkgsplit(x[2]) + mysplit = [portage.cpv_getkey(pkg_key)] + \ + list(portage.catpkgsplit(pkg_key)[2:]) if "--tree" not in self.myopts and mysplit and \ len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ x[1] == "/": @@ -4453,8 +4454,8 @@ class MergeTask(object): "--fetch-all-uri" not in self.myopts: # Figure out if we need a restart. - mysplit=portage.pkgsplit(x[2]) - if mysplit[0] == "sys-apps/portage" and x[1] == "/": + if myroot == "/" and \ + portage.dep_getkey(pkg_key) == "sys-apps/portage": if "livecvsportage" not in self.settings.features: if len(mymergelist) > mergecount: emergelog(xterm_titles, |