diff options
| -rw-r--r-- | pym/portage/__init__.py | 2 | ||||
| -rw-r--r-- | pym/portage/_deprecated.py | 28 |
2 files changed, 1 insertions, 29 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index f9c9eb718..a210535d3 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -131,7 +131,7 @@ try: 'cpv_getkey@getCPFromCPV,endversion_keys,' + \ 'suffix_value@endversion,pkgcmp,pkgsplit,vercmp,ververify', 'portage.xpak', - 'portage._deprecated:dep_virtual,' + \ + 'portage._deprecated:' + \ 'getvirtuals,pkgmerge', ) diff --git a/pym/portage/_deprecated.py b/pym/portage/_deprecated.py index ea40c2dde..ef3061cef 100644 --- a/pym/portage/_deprecated.py +++ b/pym/portage/_deprecated.py @@ -15,34 +15,6 @@ from portage.localization import _ from portage.manifest import Manifest from portage.util import writemsg, writemsg_stdout -def dep_virtual(mysplit, mysettings): - "Does virtual dependency conversion" - warnings.warn("portage.dep_virtual() is deprecated", - DeprecationWarning, stacklevel=2) - newsplit=[] - myvirtuals = mysettings.getvirtuals() - for x in mysplit: - if isinstance(x, list): - newsplit.append(dep_virtual(x, mysettings)) - else: - mykey=dep_getkey(x) - mychoices = myvirtuals.get(mykey, None) - if mychoices: - if len(mychoices) == 1: - a = x.replace(mykey, dep_getkey(mychoices[0]), 1) - else: - if x[0]=="!": - # blocker needs "and" not "or(||)". - a=[] - else: - a=['||'] - for y in mychoices: - a.append(x.replace(mykey, dep_getkey(y), 1)) - newsplit.append(a) - else: - newsplit.append(x) - return newsplit - def getvirtuals(myroot): """ Calls portage.settings.getvirtuals(). |