[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/scan/fetch/

[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/scan/fetch/

[Michał Górny]

commit:     abf62a8889702c6fa42a30807636e119d7aa312b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 08:32:13 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 20:07:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=abf62a88

repoman: Disable SRC_URI.mirror warnings when there is only 1 mirror

Disable SRC_URI.mirror warnings when the thirdpartymirrors entry
consists of no more than 1 mirror. In this case, the mirror:// is really
no different than direct URL, and it most likely means the entry is only
kept for backwards compatibility.

Closes: https://github.com/gentoo/portage/pull/58

 repoman/pym/repoman/modules/scan/fetch/fetches.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/repoman/pym/repoman/modules/scan/fetch/fetches.py b/repoman/pym/repoman/modules/scan/fetch/fetches.py
index 555f34f..9ee3c65 100644
--- a/repoman/pym/repoman/modules/scan/fetch/fetches.py
+++ b/repoman/pym/repoman/modules/scan/fetch/fetches.py
@@ -36,6 +36,12 @@ class FetchChecks(ScanBase):
 		self.thirdpartymirrors = {}
 		profile_thirdpartymirrors = self.repo_settings.repoman_settings.thirdpartymirrors().items()
 		for mirror_alias, mirrors in profile_thirdpartymirrors:
+			# Skip thirdpartymirrors that do not list more than one mirror
+			# anymore. There is no point in using mirror:// there and this
+			# means that the thirdpartymirrors entry will most likely
+			# be removed anyway.
+			if len(mirrors) <= 1:
+				continue
 			for mirror in mirrors:
 				if not mirror.endswith("/"):
 					mirror += "/"

[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/scan/fetch/

[Zac Medico]

commit:     b9b459034b1b7039844a06a6e5af39ef5aeb4b3b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 15:23:43 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May 13 15:23:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b9b45903

repoman: fix file.size.fatal qacat (bug 655576)

This qacat was renamed from file.size.fatal to file.size-fatal when the
qacats moved from python to yaml.

Fixes: 10badb74f85e62a89258f950a07b9ced82dc562a
Fixes: 910071fea7a131974b39693eef5d39b72ac4842f
Bug: https://bugs.gentoo.org/655576

 repoman/pym/repoman/modules/scan/fetch/fetches.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repoman/pym/repoman/modules/scan/fetch/fetches.py b/repoman/pym/repoman/modules/scan/fetch/fetches.py
index 241cfaa7b..5a958a461 100644
--- a/repoman/pym/repoman/modules/scan/fetch/fetches.py
+++ b/repoman/pym/repoman/modules/scan/fetch/fetches.py
@@ -124,7 +124,7 @@ class FetchChecks(ScanBase):
 				# while file size over 60 KiB causes an error.
 				elif mystat.st_size > 61440:
 					self.qatracker.add_error(
-						"file.size.fatal", "(%d KiB) %s/files/%s" % (
+						"file.size-fatal", "(%d KiB) %s/files/%s" % (
 							mystat.st_size // 1024, xpkg, y))
 				elif mystat.st_size > 20480:
 					self.qatracker.add_error(