[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/_config/

[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/_config/

[Fabian Groffen]

commit:     8150064315a7e8b8a2ddba271934c1e17ee0b31b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 20:23:04 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 20:23:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=81500643

MaskManager: fix Prefix' all profiles addition

Construct _profile_nodes since the loop below expects those, copy from
LocationManager.

---
 pym/portage/package/ebuild/_config/MaskManager.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 7d44e79..814256a 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -121,12 +121,16 @@ class MaskManager(object):
 		# lost, causing lots of issues (e.g. Portage being masked)
 		# for minimal/concentrated code change, empty repo_pkgmasklines here
 		# such that they don't count double
+		import collections
+		_profile_node = collections.namedtuple('_profile_node',
+			'location portage1_directories')
 		repo_pkgmasklines = []
 		repo_pkgunmasklines = []
 		all_profiles = []
 		for repo in repositories.repos_with_profiles():
-			all_profiles.append(os.path.join(repo.location, "profiles"))
+			all_profiles.append(_profile_node(repo.location, True))
 		all_profiles.extend(profiles)
+		# END PREFIX LOCAL
 		for x in all_profiles:
 			profile_pkgmasklines.append(grabfile_package(
 				os.path.join(x.location, "package.mask"),

[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/_config/

[Fabian Groffen]

commit:     a17c6e78495b6c43577cf8ffd46119d70ed29295
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 19:04:20 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 19:04:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a17c6e78

MaskManager: fix profiles location

Previous fix lacked the "profiles" directory added to each repo, causing
masks from the base of the repo not being seen.

---
 pym/portage/package/ebuild/_config/MaskManager.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 814256a..dfe41a1 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -128,7 +128,8 @@ class MaskManager(object):
 		repo_pkgunmasklines = []
 		all_profiles = []
 		for repo in repositories.repos_with_profiles():
-			all_profiles.append(_profile_node(repo.location, True))
+			all_profiles.append(_profile_node(
+				os.path.join(repo.location, "profiles"), True))
 		all_profiles.extend(profiles)
 		# END PREFIX LOCAL
 		for x in all_profiles:

[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/_config/

[Fabian Groffen]

commit:     62ab95554184ab40962e31f1b0f21d8c0d70b890
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 12 07:39:03 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 07:39:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=62ab9555

MaskManager: remove stray comment, bug #431016

Thanks Greg Turner <gmturner007 <AT> ameritech.net> for the original patch
that git refused to apply.

---
 pym/portage/package/ebuild/_config/MaskManager.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index dfe41a1..d424ceb 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -148,7 +148,6 @@ class MaskManager(object):
 		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
 		#remove mask atoms from everywhere with -atoms.

[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/_config/

[Fabian Groffen]

commit:     15ca82c03310c7c40ac52036b97ea2830c833e50
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 19:51:57 2015 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 19:51:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=15ca82c0

MaskManager: drop obsolete Prefix code

 pym/portage/package/ebuild/_config/MaskManager.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index f80c302..303904a 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -130,13 +130,8 @@ class MaskManager(object):
 			'location portage1_directories')
 		repo_pkgmasklines = []
 		repo_pkgunmasklines = []
-		all_profiles = []
-		for repo in repositories.repos_with_profiles():
-			all_profiles.append(_profile_node(
-				os.path.join(repo.location, "profiles"), True))
-		all_profiles.extend(profiles)
 		# END PREFIX LOCAL
-		for x in all_profiles:
+		for x in profiles:
 			profile_pkgmasklines.append(grabfile_package(
 				os.path.join(x.location, "package.mask"),
 				recursive=x.portage1_directories,

[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/_config/

[Fabian Groffen]

commit:     62e8b0cc63799781224e266896f1fc6315ec9da1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 19:44:13 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 19:44:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=62e8b0cc

MaskManager: remove prefix local hack for bug #556694

Apparently, at some point in time, this hack seemed to be necessary, but
maybe that was because our profiles weren't quite in order.  Today, it
seems to do harm (see bug #556694) and when removed things seem to
straighten themselves.

 pym/portage/package/ebuild/_config/MaskManager.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 303904a..44aba23 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -120,17 +120,6 @@ class MaskManager(object):
 		#to allow profiles to override masks from their parent profiles.
 		profile_pkgmasklines = []
 		profile_pkgunmasklines = []
-		# 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 minimal/concentrated code change, empty repo_pkgmasklines here
-		# such that they don't count double
-		import collections
-		_profile_node = collections.namedtuple('_profile_node',
-			'location portage1_directories')
-		repo_pkgmasklines = []
-		repo_pkgunmasklines = []
-		# END PREFIX LOCAL
 		for x in profiles:
 			profile_pkgmasklines.append(grabfile_package(
 				os.path.join(x.location, "package.mask"),