[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Zac Medico]

commit:     e9b210e53b7117d4b8c5cc6827790ea50cb2df13
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 07:13:31 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 23:52:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e9b210e5

repoman: fix _here_doc_re to handle file redirection

This suppresses "Unquoted Variable" warnings for sys-apps/portage ebuilds
where a here-doc is used to generate repos.conf:

  ebuild.minorsyn               6
   sys-apps/portage/portage-2.2.8-r2.ebuild: Unquoted Variable on line: 496
   sys-apps/portage/portage-2.2.20.1.ebuild: Unquoted Variable on line: 290
   sys-apps/portage/portage-2.2.23.ebuild: Unquoted Variable on line: 290
   sys-apps/portage/portage-2.2.24.ebuild: Unquoted Variable on line: 290
   sys-apps/portage/portage-2.2.25.ebuild: Unquoted Variable on line: 290
   sys-apps/portage/portage-2.2.26.ebuild: Unquoted Variable on line: 294

Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

 pym/repoman/checks/ebuilds/checks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index 7bab8e4..5420e51 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -920,7 +920,7 @@ def checks_init(experimental_inherit=False):
 			for k, kwargs in _eclass_info.items())))
 
 
-_here_doc_re = re.compile(r'.*\s<<[-]?(\w+)$')
+_here_doc_re = re.compile(r'.*<<[-]?(\w+)\s*(>\s*\S+\s*)?$')
 _ignore_comment_re = re.compile(r'^\s*#')
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     6eea3eef2734856cd397185518ebc5e8a2624ff5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 04:41:26 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6eea3eef

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     4416573552a58116fac29c26e536ca0af3976dcd
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 03:06:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=44165735

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     f8dc20495c0d634eedfd15d3ddc9f9e25d69d42e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 21:47:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f8dc2049

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     c9075d299c3e1ebaa0b113b2c6ecae58cf6a0a26
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 21:47:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c9075d29

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     9888cc7dd9b3bc3c4d2a1efa61c94087451578fe
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 21:26:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9888cc7d

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     eb305def1da58b1ad4f027baeff90c4787bdf3d0
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 21:26:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb305def

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     b05db6cd990384c06ee7c7b81a5645a722b44e43
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 23:52:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b05db6cd

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     b3484107d86f961308eff1c72e38db1872e8aafc
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 23:52:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b3484107

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Michał Górny]

commit:     b4a778380fd8d6a0750ef296d9b3afc5038d0d30
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 14:45:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b4a77838

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Michał Górny]

commit:     b45055aaa0b4120cbbe5186cb52ee1ff5695e1b5
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 14:45:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b45055aa

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     b99b194b31816e901fc716889a918c8c8e002318
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 05:47:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b99b194b

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     e751f643162a5357aab7414727d94f0e030e7b6c
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 05:47:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e751f643

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     21d5b7988c69270f8fb89cb5917c10664408d2d9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Nov 17 00:53:13 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=21d5b798

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

---
 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     8f927e2d48a96331fe6a17843b4ed7bb5e66a1e1
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Nov 17 00:53:12 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8f927e2d

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

---
 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     c4c004b5125e1785af163d3d574a3f61ccadd062
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Oct  1 23:45:34 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c4c004b5

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

---
 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     05231093d7ab7b38f82f99d5ed6164f0dc40ab55
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Oct  1 23:45:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=05231093

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

---
 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     ab8130b1b6965a54184de4a035b4ee5914b2742a
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Oct  1 22:57:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ab8130b1

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

---
 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     6d636a3d3b0547a6f97843ffede021e6242eca9b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Oct  1 22:58:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6d636a3d

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

---
 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     fc3ff802cda4854498aa8b304c1102af0cef257c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 19:39:56 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Jun  3 19:39:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fc3ff802

repoman.../use_flags.py: Reset state variables for each check() run

Also double space function separations.

---
 pym/repoman/checks/ebuilds/use_flags.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
 		@param globalUseFlags: Global USE flags
 		'''
 		self.qatracker = qatracker
+		self.globalUseFlags = globalUseFlags
 		self.useFlags = []
 		self.defaultUseFlags = []
 		self.usedUseFlags = set()
-		self.globalUseFlags = globalUseFlags
+
 
 	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
 		'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
 		@param y_ebuild: Ebuild which we check (string).
 		@param localUseFlags: Local USE flags of the package
 		'''
+		# reset state variables for the run
+		self.useFlags = []
+		self.defaultUseFlags = []
+		self.usedUseFlags = set()
 		self._checkGlobal(pkg)
 		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
 		self._checkRequiredUSE(pkg, ebuild)
 
+
 	def getUsedUseFlags(self):
 		'''Get the USE flags that this check has seen'''
 		return self.usedUseFlags
 
+
 	def _checkGlobal(self, pkg):
 		for myflag in pkg._metadata["IUSE"].split():
 			flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
 			if flag_name not in self.globalUseFlags:
 				self.useFlags.append(flag_name)
 
+
 	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
 		for mypos in range(len(self.useFlags) - 1, -1, -1):
 			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
 				"IUSE.invalid",
 				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
 
+
 	def _checkRequiredUSE(self, pkg, ebuild):
 		required_use = pkg._metadata["REQUIRED_USE"]
 		if required_use:

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Tom Wijsman]

commit:     5a5720b98aac27929a6c6485aee109a2cae30cf9
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 16:24:03 2014 +0000
Commit:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 16:24:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5a5720b9

repoman/checks/ebuild/thirdpartymirrors.py: Fix logic

---
 pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
 class ThirdPartyMirrors(object):
 
 	def __init__(self, repoman_settings, qatracker):
-		# Build a regex from thirdpartymirrors for the SRC_URI.mirror check.
+		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
 		self.thirdpartymirrors = {}
-		for k, v in repoman_settings.thirdpartymirrors().items():
-			for v in v:
-				if not v.endswith("/"):
-					v += "/"
-		self.thirdpartymirrors[v] = k
+		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
+		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			for mirror in mirrors:
+				if not mirror.endswith("/"):
+					mirror += "/"
+				self.thirdpartymirrors[mirror] = mirror_alias
+
 		self.qatracker = qatracker
 
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     d38db2e886636f067f5679138356b76aee83dee2
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 14:16:22 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Jun  2 15:35:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d38db2e8

repoman/checks/ebuilds/manifests.py: Fix a missed xpkg parameter in digest_check()

Add an extra generated_manifest = False
This is a pre-emptive commit. I plan to re-use the same class instances for multiple checks.

---
 pym/repoman/checks/ebuilds/manifests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/manifests.py b/pym/repoman/checks/ebuilds/manifests.py
index c9eda54..fb08c5e 100644
--- a/pym/repoman/checks/ebuilds/manifests.py
+++ b/pym/repoman/checks/ebuilds/manifests.py
@@ -21,6 +21,7 @@ class Manifests(object):
 
 
 	def run(self, checkdir, portdb):
+		self.generated_manifest = False
 		if self.options.pretend:
 			return False
 		if self.options.mode in ("manifest", 'commit', 'fix') or self.digest_only:
@@ -93,7 +94,7 @@ class Manifests(object):
 			portage._doebuild_manifest_exempt_depend -= 1
 
 
-	def digest_check(self, checkdir):
+	def digest_check(self, xpkg, checkdir):
 		self.repoman_settings['O'] = checkdir
 		self.repoman_settings['PORTAGE_QUIET'] = '1'
 		if not portage.digestcheck([], self.repoman_settings, strict=1):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/

[Brian Dolbec]

commit:     aaa087d7f65f7fe32d48b43b46c5ab16a99bfb2d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 14:16:22 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Jun  2 14:23:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aaa087d7

repoman/checks/ebuilds/manifests.py: add an extra generated_manifest = False

This is a pre-emptive commit. I plan to re-use the same class instances for multiple checks.

---
 pym/repoman/checks/ebuilds/manifests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/checks/ebuilds/manifests.py b/pym/repoman/checks/ebuilds/manifests.py
index c9eda54..fb08c5e 100644
--- a/pym/repoman/checks/ebuilds/manifests.py
+++ b/pym/repoman/checks/ebuilds/manifests.py
@@ -21,6 +21,7 @@ class Manifests(object):
 
 
 	def run(self, checkdir, portdb):
+		self.generated_manifest = False
 		if self.options.pretend:
 			return False
 		if self.options.mode in ("manifest", 'commit', 'fix') or self.digest_only:
@@ -93,7 +94,7 @@ class Manifests(object):
 			portage._doebuild_manifest_exempt_depend -= 1
 
 
-	def digest_check(self, checkdir):
+	def digest_check(self, xpkg, checkdir):
 		self.repoman_settings['O'] = checkdir
 		self.repoman_settings['PORTAGE_QUIET'] = '1'
 		if not portage.digestcheck([], self.repoman_settings, strict=1):