[gentoo-portage-dev] [PATCH 1/2] Add list of live eclasses to portage.const

[gentoo-portage-dev] [PATCH 1/2] Add list of live eclasses to portage.const

[SebastianLuther]

From: Sebastian Luther <SebastianLuther@gmx.de>

---
 bin/repoman                   | 11 +----------
 pym/_emerge/EbuildExecuter.py | 11 +----------
 pym/portage/_sets/__init__.py |  2 +-
 pym/portage/const.py          | 12 ++++++++++++
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/bin/repoman b/bin/repoman
index 1a02050..872b6e1 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -424,16 +424,7 @@ valid_restrict = frozenset(["binchecks", "bindist",
 	"fetch", "installsources", "mirror", "preserve-libs",
 	"primaryuri", "splitdebug", "strip", "test", "userpriv"])
 
-live_eclasses = frozenset([
-	"bzr",
-	"cvs",
-	"darcs",
-	"git",
-	"git-2",
-	"mercurial",
-	"subversion",
-	"tla",
-])
+live_eclasses = portage.const.LIVE_ECLASSES
 
 suspect_rdepend = frozenset([
 	"app-arch/cabextract",
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index cfbc90d..5587d4e 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -16,16 +16,7 @@ class EbuildExecuter(CompositeTask):
 
 	_phases = ("prepare", "configure", "compile", "test", "install")
 
-	_live_eclasses = frozenset([
-		"bzr",
-		"cvs",
-		"darcs",
-		"git",
-		"git-2",
-		"mercurial",
-		"subversion",
-		"tla",
-	])
+	_live_eclasses = portage.const.LIVE_ECLASSES
 
 	def _start(self):
 		pkg = self.pkg
diff --git a/pym/portage/_sets/__init__.py b/pym/portage/_sets/__init__.py
index a545dba..75d1df7 100644
--- a/pym/portage/_sets/__init__.py
+++ b/pym/portage/_sets/__init__.py
@@ -140,7 +140,7 @@ class SetConfig(object):
 		parser.add_section("live-rebuild")
 		parser.set("live-rebuild", "class", "portage.sets.dbapi.VariableSet")
 		parser.set("live-rebuild", "variable", "INHERITED")
-		parser.set("live-rebuild", "includes", "bzr cvs darcs git git-2 mercurial subversion tla")
+		parser.set("live-rebuild", "includes", " ".join(sorted(portage.const.LIVE_ECLASSES)))
 
 		parser.remove_section("module-rebuild")
 		parser.add_section("module-rebuild")
diff --git a/pym/portage/const.py b/pym/portage/const.py
index 214ede4..04b5a57 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -174,6 +174,18 @@ if "PORTAGE_OVERRIDE_EPREFIX" in os.environ:
 
 VCS_DIRS = ("CVS", "RCS", "SCCS", ".bzr", ".git", ".hg", ".svn")
 
+# List of known live eclasses. Keep it in sync with cnf/sets/protage.conf
+LIVE_ECLASSES = frozenset([
+	"bzr",
+	"cvs",
+	"darcs",
+	"git",
+	"git-2",
+	"mercurial",
+	"subversion",
+	"tla",
+])
+
 SUPPORTED_BINPKG_FORMATS = ("tar", "rpm")
 # ===========================================================================
 # END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANT
-- 
1.8.1.5

[gentoo-portage-dev] [PATCH 2/2] Add git-r3 to the list of live eclasses

[SebastianLuther]

From: Sebastian Luther <SebastianLuther@gmx.de>

---
 cnf/sets/portage.conf | 2 +-
 pym/portage/const.py  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf
index c5c787b..b73afb1 100644
--- a/cnf/sets/portage.conf
+++ b/cnf/sets/portage.conf
@@ -51,7 +51,7 @@ class = portage.sets.libs.PreservedLibraryConsumerSet
 [live-rebuild]
 class = portage.sets.dbapi.VariableSet
 variable = INHERITED
-includes = bzr cvs darcs git git-2 mercurial subversion tla
+includes = bzr cvs darcs git git-2 git-r3 mercurial subversion tla
 
 # Installed packages that own files inside /lib/modules.
 [module-rebuild]
diff --git a/pym/portage/const.py b/pym/portage/const.py
index 04b5a57..5912f97 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -181,6 +181,7 @@ LIVE_ECLASSES = frozenset([
 	"darcs",
 	"git",
 	"git-2",
+	"git-r3",
 	"mercurial",
 	"subversion",
 	"tla",
-- 
1.8.1.5

Re: [gentoo-portage-dev] [PATCH 2/2] Add git-r3 to the list of live eclasses

[Sebastian Luther]

See bug 489662.

https://bugs.gentoo.org/489662

Re: [gentoo-portage-dev] [PATCH 1/2] Add list of live eclasses to portage.const

[Tom Wijsman]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

On Fri, 29 Nov 2013 21:33:31 +0100
SebastianLuther@gmx.de wrote:

> +# List of known live eclasses. Keep it in sync with
> cnf/sets/protage.conf
            ^
Small typo. :) 

> -includes = bzr cvs darcs git git-2 mercurial subversion tla
> +includes = bzr cvs darcs git git-2 git-r3 mercurial subversion tla

> +	"git-r3",

Thank you very much, that warning gets me every time.

-- 
With kind regards,

Tom Wijsman (TomWij)
Gentoo Developer

E-mail address  : TomWij@gentoo.org
GPG Public Key  : 6D34E57D
GPG Fingerprint : C165 AF18 AB4C 400B C3D2  ABF0 95B2 1FCD 6D34 E57D

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [gentoo-portage-dev] [PATCH 1/2] Add list of live eclasses to portage.const

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 61 bytes --]

fixed the typo pointed out by Tom and merged.  thanks!
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]