diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-11-24 08:36:12 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-24 08:36:12 -0800 |
| commit | b67030859e9800292f601d326d203abc6f9e9270 (patch) | |
| tree | e1df43a13bf43fe39964068cfc1a859a50806728 /pym/portage/package/ebuild/config.py | |
| parent | grab*_package: optimize for non-existent files (diff) | |
| download | portage-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.py')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 6c513c696..9d53888ce 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -205,7 +205,6 @@ class config(object): self._non_user_variables = clone._non_user_variables self.usemask = clone.usemask self.useforce = clone.useforce - self.useunsatisfiable = clone.useunsatisfiable self.puse = clone.puse self.user_profile_dir = clone.user_profile_dir self.local_config = clone.local_config @@ -515,7 +514,6 @@ class config(object): #Initialize all USE related variables we track ourselves. self.usemask = self._use_manager.getUseMask() self.useforce = self._use_manager.getUseForce() - self.useunsatisfiable = self._use_manager.getUseUnsatisfiable() self.configdict["conf"]["USE"] = \ self._use_manager.extract_global_USE_changes( \ self.configdict["conf"].get("USE", "")) @@ -891,7 +889,6 @@ class config(object): " ".join(self.make_defaults_use) self.usemask = self._use_manager.getUseMask() self.useforce = self._use_manager.getUseForce() - self.useunsatisfiable = self._use_manager.getUseUnsatisfiable() self.regenerate() class _lazy_vars(object): @@ -1131,11 +1128,6 @@ class config(object): self.usemask = usemask has_changed = True - useunsatisfiable = self._use_manager.getUseUnsatisfiable(cpv_slot) - if useunsatisfiable != self.useunsatisfiable: - self.useunsatisfiable = useunsatisfiable - has_changed = True - oldpuse = self.puse self.puse = self._use_manager.getPUSE(cpv_slot) if oldpuse != self.puse: @@ -1367,9 +1359,6 @@ class config(object): def _getUseForce(self, pkg): return self._use_manager.getUseForce(pkg) - def _getUseUnsatisfiable(self, pkg): - return self._use_manager.getUseUnsatisfiable(pkg) - def _getMaskAtom(self, cpv, metadata): """ Take a package and return a matching package.mask atom, or None if no |