diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-11-26 20:37:41 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-11-26 20:37:41 -0800 |
| commit | 8fa262d62b885d5cd8251faa018695022311872a (patch) | |
| tree | d0d11c932c42fcc8237f3960d9aadf1817bd7ef4 /pym/_emerge/resolver | |
| parent | 2083dae3fc52e2387d1c137c8aa203d083f13fc9 (diff) | |
| download | portage-8fa262d62b885d5cd8251faa018695022311872a.tar.gz portage-8fa262d62b885d5cd8251faa018695022311872a.tar.bz2 portage-8fa262d62b885d5cd8251faa018695022311872a.zip | |
Rename Package.metadata to _metadata.
The raw metadata is considered a private low-level internal. This
makes the Package class consistent with the _pkg_str class.
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/circular_dependency.py | 8 | ||||
| -rw-r--r-- | pym/_emerge/resolver/output.py | 4 | ||||
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/resolver/circular_dependency.py index 76c7b3afb..52561239e 100644 --- a/pym/_emerge/resolver/circular_dependency.py +++ b/pym/_emerge/resolver/circular_dependency.py @@ -114,10 +114,10 @@ class circular_dependency_handler(object): parent_atoms = self.all_parent_atoms.get(pkg) if priorities[-1].buildtime: - dep = " ".join(parent.metadata[k] + dep = " ".join(parent._metadata[k] for k in Package._buildtime_keys) elif priorities[-1].runtime: - dep = parent.metadata["RDEPEND"] + dep = parent._metadata["RDEPEND"] for ppkg, atom in parent_atoms: if ppkg == parent: @@ -146,7 +146,7 @@ class circular_dependency_handler(object): #If any of the flags we're going to touch is in REQUIRED_USE, add all #other flags in REQUIRED_USE to affecting_use, to not lose any solution. required_use_flags = get_required_use_flags( - parent.metadata.get("REQUIRED_USE", ""), + parent._metadata.get("REQUIRED_USE", ""), eapi=parent.eapi) if affecting_use.intersection(required_use_flags): @@ -189,7 +189,7 @@ class circular_dependency_handler(object): parent_atom not in reduced_dep: #We found an assignment that removes the atom from 'dep'. #Make sure it doesn't conflict with REQUIRED_USE. - required_use = parent.metadata.get("REQUIRED_USE", "") + required_use = parent._metadata.get("REQUIRED_USE", "") if check_required_use(required_use, current_use, parent.iuse.is_valid_flag, diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index cfacab149..1fdc08def 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -651,7 +651,7 @@ class Display(object): pkg_info.repo_path_real = self.portdb.getRepositoryPath(pkg.repo) pkg_info.use = list(self.conf.pkg_use_enabled(pkg)) if not pkg.built and pkg.operation == 'merge' and \ - 'fetch' in pkg.metadata.restrict: + 'fetch' in pkg._metadata.restrict: if pkg_info.ordered: self.counters.restrict_fetch += 1 pkg_info.attr_display.fetch_restrict = True @@ -853,7 +853,7 @@ class Display(object): pkg_info.oldbest = self.convert_myoldbest(pkg, pkg_info) pkg_info.system, pkg_info.world = \ self.check_system_world(pkg) - if 'interactive' in pkg.metadata.properties and \ + if 'interactive' in pkg._metadata.properties and \ pkg.operation == 'merge': pkg_info.attr_display.interactive = True if ordered: diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index c2b04d58c..e04166b81 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -872,7 +872,7 @@ class slot_conflict_handler(object): #Make sure the changes don't violate REQUIRED_USE for pkg in required_changes: - required_use = pkg.metadata.get("REQUIRED_USE") + required_use = pkg._metadata.get("REQUIRED_USE") if not required_use: continue |