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

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

[Brian Dolbec]

commit:     2ceec91cec02b94cad84fddaf29bbe884baa1b6d
Author:     Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Mon Jun 19 12:31:50 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 21:29:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2ceec91c

Repoman: detect inconsistent metadata.xml indentation

 repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
index 92c74e6f8..6a0f501ec 100644
--- a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
@@ -3,8 +3,10 @@
 '''Package Metadata Checks operations'''
 
 import sys
+import re
 
 from itertools import chain
+from collections import Counter
 
 try:
 	from lxml import etree
@@ -96,6 +98,14 @@ class PkgMetadata(ScanBase, USEFlagChecks):
 			self.muselist = frozenset(self.musedict)
 			return False
 
+		indentation_chars = Counter()
+		for l in etree.tostring(_metadata_xml).splitlines():
+			indentation_chars.update(re.match(b"\s*", l).group(0))
+		if len(indentation_chars) > 1:
+			self.qatracker.add_error("metadata.warning", "%s/metadata.xml: %s" %
+				(xpkg, "inconsistent use of tabs and spaces in indentation")
+			)
+
 		xml_encoding = _metadata_xml.docinfo.encoding
 		if xml_encoding.upper() != metadata_xml_encoding:
 			self.qatracker.add_error(

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

[Brian Dolbec]

commit:     e6b7d178043426edeb277b8b391d1b50b4c59b84
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 21:36:17 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 22:29:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e6b7d178

repoman: modules/scan/metadata: Add missed mod_kwargs 'repo_settings'

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

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

diff --git a/repoman/pym/repoman/modules/scan/metadata/__init__.py b/repoman/pym/repoman/modules/scan/metadata/__init__.py
index 03548d164..2d111b4e0 100644
--- a/repoman/pym/repoman/modules/scan/metadata/__init__.py
+++ b/repoman/pym/repoman/modules/scan/metadata/__init__.py
@@ -75,7 +75,7 @@ module_spec = {
 			'functions': ['check'],
 			'func_desc': {
 			},
-			'mod_kwargs': ['qatracker',
+			'mod_kwargs': ['qatracker', 'repo_settings'
 			],
 			'func_kwargs': {
 				'ebuild': (None, None),

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

[Brian Dolbec]

commit:     19eb56c8a696d9b41b7a93bc4483d0e324eb8756
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 21:36:17 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 23:00:49 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=19eb56c8

repoman: modules/scan/metadata: Add missed mod_kwargs 'repo_settings'

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

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

diff --git a/repoman/pym/repoman/modules/scan/metadata/__init__.py b/repoman/pym/repoman/modules/scan/metadata/__init__.py
index 03548d164..2d111b4e0 100644
--- a/repoman/pym/repoman/modules/scan/metadata/__init__.py
+++ b/repoman/pym/repoman/modules/scan/metadata/__init__.py
@@ -75,7 +75,7 @@ module_spec = {
 			'functions': ['check'],
 			'func_desc': {
 			},
-			'mod_kwargs': ['qatracker',
+			'mod_kwargs': ['qatracker', 'repo_settings'
 			],
 			'func_kwargs': {
 				'ebuild': (None, None),