summaryrefslogtreecommitdiffstats
path: root/pym/portage/package/ebuild/_config/UseManager.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-11-24 08:36:12 -0800
committerZac Medico <zmedico@gentoo.org>2010-11-24 08:36:12 -0800
commitb67030859e9800292f601d326d203abc6f9e9270 (patch)
treee1df43a13bf43fe39964068cfc1a859a50806728 /pym/portage/package/ebuild/_config/UseManager.py
parent4f4508c0ae246ee66542a2529d9225d110373253 (diff)
downloadportage-b67030859e9800292f601d326d203abc6f9e9270.tar.gz
portage-b67030859e9800292f601d326d203abc6f9e9270.tar.bz2
portage-b67030859e9800292f601d326d203abc6f9e9270.zip
Revert use.unsatisfiable support for now.
The current implementation doesn't provide anything to distinguish it from use.mask, and it's arguable that another approach such as an atom syntax extension (for optional dependencies) would be more appropriate. This reverts commit 93ee6a847be949e7752c3c052d3eb0619e408b43.
Diffstat (limited to 'pym/portage/package/ebuild/_config/UseManager.py')
-rw-r--r--pym/portage/package/ebuild/_config/UseManager.py23
1 files changed, 0 insertions, 23 deletions
diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index 99e2fea07..ff206e536 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -22,11 +22,9 @@ class UseManager(object):
#--------------------------------
# use.mask _usemask_list
# use.force _useforce_list
- # use.unsatisfiable _useunsatisfiable_list
# package.use.mask _pusemask_list
# package.use _pkgprofileuse
# package.use.force _puseforce_list
- # package.use.unsatisfiable _puseunsatisfiable_list
#--------------------------------
# user config
#--------------------------------
@@ -45,11 +43,9 @@ class UseManager(object):
self._usemask_list = self._parse_profile_files_to_tuple("use.mask", profiles)
self._useforce_list = self._parse_profile_files_to_tuple("use.force", profiles)
- self._useunsatisfiable_list = self._parse_profile_files_to_tuple("use.unsatisfiable", profiles)
self._pusemask_list = self._parse_profile_files_to_dict("package.use.mask", profiles)
self._pkgprofileuse = self._parse_profile_files_to_dict("package.use", profiles, juststrings=True)
self._puseforce_list = self._parse_profile_files_to_dict("package.use.force", profiles)
- self._puseunsatisfiable_list = self._parse_profile_files_to_dict("package.use.unsatisfiable", profiles)
self._pusedict = self._parse_user_files_to_extatomdict("package.use", abs_user_config, user_config)
@@ -149,25 +145,6 @@ class UseManager(object):
useforce.extend(pkg_useforce)
return frozenset(stack_lists(useforce, incremental=True))
- def getUseUnsatisfiable(self, pkg=None):
- if pkg is None:
- return frozenset(stack_lists(
- self._useunsatisfiable_list, incremental=True))
-
- cp = getattr(pkg, "cp", None)
- if cp is None:
- cp = cpv_getkey(remove_slot(pkg))
- useunsatisfiable = []
- for i, punsatisfiable_dict in enumerate(self._puseunsatisfiable_list):
- if self._useunsatisfiable_list[i]:
- useunsatisfiable.append(self._useunsatisfiable_list[i])
- cpdict = punsatisfiable_dict.get(cp)
- if cpdict:
- pkg_useunsatisfiable = ordered_by_atom_specificity(cpdict, pkg)
- if pkg_useunsatisfiable:
- useunsatisfiable.extend(pkg_useunsatisfiable)
- return frozenset(stack_lists(useunsatisfiable, incremental=True))
-
def getPUSE(self, pkg):
cp = getattr(pkg, "cp", None)
if cp is None: