diff options
| -rw-r--r-- | man/portage.5 | 1 | ||||
| -rw-r--r-- | pym/_emerge/Package.py | 5 | ||||
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 5 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 3 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/getmaskingstatus.py | 4 |
5 files changed, 4 insertions, 14 deletions
diff --git a/man/portage.5 b/man/portage.5 index b2b0eb12c..b783f6239 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -280,6 +280,7 @@ Provides the list of packages that compose the special \fIsystem\fR set. \- comments begin with # (no inline comments) \- one DEPEND atom per line \- packages to be added to the system set begin with a * +\- atoms without * only appear for legacy reasons .fi .I Note: In a cascading profile setup, you can remove packages in children diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 20c72b481..0790946a9 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -239,11 +239,6 @@ class Package(Task): if mask_atom is not None: masks['package.mask'] = mask_atom - system_mask = settings._getProfileMaskAtom( - self.cpv, self.metadata) - if system_mask is not None: - masks['profile.system'] = system_mask - try: missing_licenses = settings._getMissingLicenses( self.cpv, self.metadata) diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index ecf275cd4..bf8ecd902 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -874,8 +874,6 @@ class portdbapi(dbapi): continue if settings._getMaskAtom(cpv, metadata): continue - if settings._getProfileMaskAtom(cpv, metadata): - continue if local_config: metadata["USE"] = "" if "?" in metadata["LICENSE"] or "?" in metadata["PROPERTIES"]: @@ -940,7 +938,6 @@ class portdbapi(dbapi): db_keys = ["SLOT"] visible = [] getMaskAtom = self.settings._getMaskAtom - getProfileMaskAtom = self.settings._getProfileMaskAtom for cpv in mylist: try: metadata = dict(zip(db_keys, self.aux_get(cpv, db_keys))) @@ -951,8 +948,6 @@ class portdbapi(dbapi): continue if getMaskAtom(cpv, metadata): continue - if getProfileMaskAtom(cpv, metadata): - continue visible.append(cpv) return visible diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index a8c6ad665..a591c9ad7 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1462,6 +1462,9 @@ class config(object): @return: A matching profile atom string or None if one is not found. """ + warnings.warn("The config._getProfileMaskAtom() method is deprecated.", + DeprecationWarning, stacklevel=2) + cp = cpv_getkey(cpv) profile_atoms = self.prevmaskdict.get(cp) if profile_atoms: diff --git a/pym/portage/package/ebuild/getmaskingstatus.py b/pym/portage/package/ebuild/getmaskingstatus.py index 4c65fccaa..6eaa223f6 100644 --- a/pym/portage/package/ebuild/getmaskingstatus.py +++ b/pym/portage/package/ebuild/getmaskingstatus.py @@ -72,10 +72,6 @@ def _getmaskingstatus(mycpv, settings, portdb, myrepo=None): rValue = [] - # profile checking - if settings._getProfileMaskAtom(mycpv, metadata): - rValue.append(_MaskReason("profile", "profile")) - # package.mask checking if settings._getMaskAtom(mycpv, metadata): rValue.append(_MaskReason("package.mask", "package.mask", _UnmaskHint("p_mask", None))) |