From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14EDD139696 for ; Tue, 27 Jun 2017 21:36:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53C41E0C09; Tue, 27 Jun 2017 21:36:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31A74E0C09 for ; Tue, 27 Jun 2017 21:36:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 207B53416CA for ; Tue, 27 Jun 2017 21:36:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D4237491 for ; Tue, 27 Jun 2017 21:36:04 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1498598970.2ceec91cec02b94cad84fddaf29bbe884baa1b6d.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/metadata/ X-VCS-Repository: proj/portage X-VCS-Files: repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py X-VCS-Directories: repoman/pym/repoman/modules/scan/metadata/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 2ceec91cec02b94cad84fddaf29bbe884baa1b6d X-VCS-Branch: repoman Date: Tue, 27 Jun 2017 21:36:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 404e06e2-50d0-40cf-b753-0c1f6473c3ef X-Archives-Hash: c26b63574008cdfa0ce67dfff183c378 commit: 2ceec91cec02b94cad84fddaf29bbe884baa1b6d Author: Louis Sautier gmail com> AuthorDate: Mon Jun 19 12:31:50 2017 +0000 Commit: Brian Dolbec gentoo 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(