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 554EB1388BF for ; Sun, 10 Jan 2016 03:26:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B17321C015; Sun, 10 Jan 2016 03:26:07 +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 53B6621C014 for ; Sun, 10 Jan 2016 03:26:06 +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 8B4B43408A6 for ; Sun, 10 Jan 2016 03:26:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6035AE5B for ; Sun, 10 Jan 2016 03:26:00 +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: <1452396230.2df2c8204bcb6f54b3cbc7f22951fdcb897ac34f.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/metadata/ebuild_metadata.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ pym/repoman/modules/scan/metadata/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 2df2c8204bcb6f54b3cbc7f22951fdcb897ac34f X-VCS-Branch: repoman Date: Sun, 10 Jan 2016 03:26:00 +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: 454bb1d6-c662-4a29-b3cf-bc0b829d7f92 X-Archives-Hash: d5440fe26a8232d304edf343a7f969b7 commit: 2df2c8204bcb6f54b3cbc7f22951fdcb897ac34f Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 11:31:26 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Jan 10 03:23:50 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2df2c820 scanner.py: Migrate another metadata check to ebuild_metadata pym/repoman/modules/scan/metadata/ebuild_metadata.py | 3 +++ pym/repoman/scanner.py | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py b/pym/repoman/modules/scan/metadata/ebuild_metadata.py index 143a40e..2dc1db2 100644 --- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py +++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py @@ -28,6 +28,9 @@ class EbuildMetadata(object): "%s: %s variable contains non-ASCII " "character at position %s" % (ebuild.relative_path, k, m.start() + 1)) + if ebuild.metadata.get("PROVIDE"): + self.qatracker.add_error("virtual.oldstyle", ebuild.relative_path) + return {'continue': False} @property diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index e6a17cd..46f46f5 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -324,8 +324,6 @@ class Scanner(object): if y_ebuild_continue: continue - if dynamic_data['ebuild'].metadata.get("PROVIDE"): - self.qatracker.add_error("virtual.oldstyle", dynamic_data['ebuild'].relative_path) for pos, missing_var in enumerate(missingvars): if not dynamic_data['ebuild'].metadata.get(missing_var):