From: Fabian Groffen Date: Mon, 20 Sep 2010 20:25:55 +0000 (+0200) Subject: fix for previous commit to this file, just reread the profile package.mask files X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=997a4542764a99577f11f48403f4246b7173edf0;p=portage.git fix for previous commit to this file, just reread the profile package.mask files --- diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py index a09dfb595..b90f56961 100644 --- a/pym/portage/package/ebuild/_config/MaskManager.py +++ b/pym/portage/package/ebuild/_config/MaskManager.py @@ -45,19 +45,24 @@ class MaskManager(object): # PREFIX LOCAL: Prefix has unmasks for stuff in profiles/package.mask # If we don't consider the repomasks here, those unmasks are # lost, causing lots of issues (e.g. Portage being masked) - for x in profiles: - #profile_pkgmasklines.append(grabfile_package( - profile_pkgmasklines = grabfile_package( - os.path.join(x, "package.mask"), recursive=1, remember_source_file=True, verify_eapi=True)#) - #profile_pkgunmasklines.append(grabfile_package( - profile_pkgunmasklines = grabfile_package( - os.path.join(x, "package.unmask"), recursive=1, remember_source_file=True, verify_eapi=True)#) - #profile_pkgmasklines = stack_lists(profile_pkgmasklines, incremental=1, \ - # remember_source_file=True, warn_for_unmatched_removal=True, - # strict_warn_for_unmatched_removal=strict_umatched_removal) - #profile_pkgunmasklines = stack_lists(profile_pkgunmasklines, incremental=1, \ - # remember_source_file=True, warn_for_unmatched_removal=True, - # strict_warn_for_unmatched_removal=strict_umatched_removal) + # for minimal/concentrated code change, empty repo_pkgmasklines here + # such that they don't count double + repo_pkgmasklines = [] + repo_pkgunmasklines = [] + all_profiles = [] + all_profiles.extend(repo_profiles) + all_profiles.extend(profiles) + for x in all_profiles: + profile_pkgmasklines.append(grabfile_package( + os.path.join(x, "package.mask"), recursive=1, remember_source_file=True, verify_eapi=True)) + profile_pkgunmasklines.append(grabfile_package( + os.path.join(x, "package.unmask"), recursive=1, remember_source_file=True, verify_eapi=True)) + profile_pkgmasklines = stack_lists(profile_pkgmasklines, incremental=1, \ + remember_source_file=True, warn_for_unmatched_removal=True, + strict_warn_for_unmatched_removal=strict_umatched_removal) + profile_pkgunmasklines = stack_lists(profile_pkgunmasklines, incremental=1, \ + remember_source_file=True, warn_for_unmatched_removal=True, + strict_warn_for_unmatched_removal=strict_umatched_removal) # PREFIX LOCAL #Read /etc/portage/package.mask. Don't stack it to allow the user to