From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4650D58973 for ; Mon, 18 Jan 2016 19:24:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 729E121C14E; Mon, 18 Jan 2016 19:23:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B3FF21C16B for ; Mon, 18 Jan 2016 19:23:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FA34340845 for ; Mon, 18 Jan 2016 19:23:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F5A81068 for ; Mon, 18 Jan 2016 19:23:42 +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: <1453144803.7609a1b012c9b91b01164dad8e4bc16cf0c3871e.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/directories/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/directories/__init__.py pym/repoman/modules/scan/directories/encoding.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ pym/repoman/modules/scan/directories/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 7609a1b012c9b91b01164dad8e4bc16cf0c3871e X-VCS-Branch: repoman Date: Mon, 18 Jan 2016 19:23:42 +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: 5d7b37b8-c27e-482d-897f-d5564bfa45da X-Archives-Hash: 4c4d5d23bd559ea192dd830a43beed74 commit: 7609a1b012c9b91b01164dad8e4bc16cf0c3871e Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 04:44:05 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 18 19:20:03 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7609a1b0 repoman: Create new EncodingCheck class plugin pym/repoman/modules/scan/directories/__init__.py | 8 +++++ pym/repoman/modules/scan/directories/encoding.py | 41 ++++++++++++++++++++++++ pym/repoman/scanner.py | 21 +----------- 3 files changed, 50 insertions(+), 20 deletions(-) diff --git a/pym/repoman/modules/scan/directories/__init__.py b/pym/repoman/modules/scan/directories/__init__.py index b9daef0..548d393 100644 --- a/pym/repoman/modules/scan/directories/__init__.py +++ b/pym/repoman/modules/scan/directories/__init__.py @@ -26,6 +26,14 @@ module_spec = { 'func_kwargs': { }, }, + 'encoding-module': { + 'name': "encoding", + 'class': "EncodingCheck", + 'description': doc, + 'functions': ['check'], + 'func_kwargs': { + }, + }, } } diff --git a/pym/repoman/modules/scan/directories/encoding.py b/pym/repoman/modules/scan/directories/encoding.py new file mode 100644 index 0000000..0985e16 --- /dev/null +++ b/pym/repoman/modules/scan/directories/encoding.py @@ -0,0 +1,41 @@ + +import io + +from portage import _encodings +from portage import _unicode_encode + +from repoman.checks.ebuilds.checks import run_checks + + +class EncodingCheck(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + pkg = kwargs.get('pkg') + try: + # All ebuilds should have utf_8 encoding. + f = io.open( + _unicode_encode(ebuild.full_path, encoding=_encodings['fs'], + errors='strict'), + mode='r', encoding=_encodings['repo.content']) + try: + for check_name, e in run_checks(f, pkg): + self.qatracker.add_error( + check_name, ebuild.relative_path + ': %s' % e) + finally: + f.close() + except UnicodeDecodeError: + # A file.UTF8 failure will have already been recorded. + pass + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index b00dbd9..ac77d1f 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -3,7 +3,6 @@ from __future__ import print_function, unicode_literals import copy -import io import logging from itertools import chain from pprint import pformat @@ -13,11 +12,8 @@ from _emerge.Package import Package import portage from portage import normalize_path from portage import os -from portage import _encodings -from portage import _unicode_encode from portage.dep import Atom from portage.output import green -from repoman.checks.ebuilds.checks import run_checks from repoman.modules.commit import repochecks from repoman.profile import check_profiles, dev_profile_keywords, setup_profile from repoman.repos import repo_metadata @@ -293,7 +289,7 @@ class Scanner(object): ('arches', 'ArchChecks'), ('depend', 'DependChecks'), ('use_flags', 'USEFlagChecks'), ('ruby', 'RubyEclassChecks'), ('license', 'LicenseChecks'), ('restrict', 'RestrictChecks'), - ('mtime', 'MtimeChecks'), + ('mtime', 'MtimeChecks'), ('encoding', 'EncodingCheck'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -322,21 +318,6 @@ class Scanner(object): continue # Syntax Checks - try: - # All ebuilds should have utf_8 encoding. - f = io.open( - _unicode_encode( - dynamic_data['ebuild'].full_path, encoding=_encodings['fs'], errors='strict'), - mode='r', encoding=_encodings['repo.content']) - try: - for check_name, e in run_checks(f, dynamic_data['pkg']): - self.qatracker.add_error( - check_name, dynamic_data['ebuild'].relative_path + ': %s' % e) - finally: - f.close() - except UnicodeDecodeError: - # A file.UTF8 failure will have already been recorded above. - pass if self.options.force: # The dep_check() calls are the most expensive QA test. If --force