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/portage/package | |
| 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/portage/package')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 6 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/getmaskingstatus.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 86eac8a52..75fc1de8d 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1248,7 +1248,7 @@ class config(object): if not isinstance(mycpv, basestring): pkg = mycpv mycpv = pkg.cpv - mydb = pkg.metadata + mydb = pkg._metadata explicit_iuse = pkg.iuse.all args_hash = (mycpv, id(pkg)) if pkg.built: diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index a1f27db9d..d737e66e0 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1334,9 +1334,9 @@ def _validate_deps(mysettings, myroot, mydo, mydbapi): if not pkg.built and \ mydo not in ("digest", "help", "manifest") and \ - pkg.metadata["REQUIRED_USE"] and \ + pkg._metadata["REQUIRED_USE"] and \ eapi_has_required_use(pkg.eapi): - result = check_required_use(pkg.metadata["REQUIRED_USE"], + result = check_required_use(pkg._metadata["REQUIRED_USE"], pkg.use.enabled, pkg.iuse.is_valid_flag, eapi=pkg.eapi) if not result: reduced_noise = result.tounicode() @@ -1345,7 +1345,7 @@ def _validate_deps(mysettings, myroot, mydo, mydbapi): writemsg(" %s\n" % reduced_noise, noiselevel=-1) normalized_required_use = \ - " ".join(pkg.metadata["REQUIRED_USE"].split()) + " ".join(pkg._metadata["REQUIRED_USE"].split()) if reduced_noise != normalized_required_use: writemsg("\n %s\n" % _("The above constraints " + \ "are a subset of the following complete expression:"), diff --git a/pym/portage/package/ebuild/getmaskingstatus.py b/pym/portage/package/ebuild/getmaskingstatus.py index 954abced9..4dbe6a970 100644 --- a/pym/portage/package/ebuild/getmaskingstatus.py +++ b/pym/portage/package/ebuild/getmaskingstatus.py @@ -48,7 +48,7 @@ def _getmaskingstatus(mycpv, settings, portdb, myrepo=None): # emerge passed in a Package instance pkg = mycpv mycpv = pkg.cpv - metadata = pkg.metadata + metadata = pkg._metadata installed = pkg.installed if metadata is None: |