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 305E2138206 for ; Mon, 25 Apr 2016 15:32:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB2B921C056; Mon, 25 Apr 2016 15:32:32 +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 A8B7E21C030 for ; Mon, 25 Apr 2016 15:32:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64898340B10 for ; Mon, 25 Apr 2016 15:32:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6508965 for ; Mon, 25 Apr 2016 15:32:27 +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: <1461598133.baa93beabed3da1186683c0a4ea9e6fed4d3fbda.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/ebuild/ebuild.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/modules/scan/ebuild/ pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: baa93beabed3da1186683c0a4ea9e6fed4d3fbda X-VCS-Branch: repoman Date: Mon, 25 Apr 2016 15:32:27 +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: fc40fc3d-6c0d-4946-956a-5d0b322e0a81 X-Archives-Hash: caca9054982bd4d308a3b08a501aa4c1 commit: baa93beabed3da1186683c0a4ea9e6fed4d3fbda Author: Brian Dolbec gentoo org> AuthorDate: Fri Mar 11 00:11:13 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Apr 25 15:28:53 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=baa93bea repoman: Move changelog_modified to dynamic_data for use in the scan/ebuild module pym/repoman/modules/scan/ebuild/ebuild.py | 3 ++- pym/repoman/scanner.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py b/pym/repoman/modules/scan/ebuild/ebuild.py index 0ae416b..e9a2cdd 100644 --- a/pym/repoman/modules/scan/ebuild/ebuild.py +++ b/pym/repoman/modules/scan/ebuild/ebuild.py @@ -74,9 +74,10 @@ class Ebuild(ScanBase): self.xpkg = kwargs.get('xpkg') self.y_ebuild = kwargs.get('y_ebuild') self.changed = kwargs.get('changed') + changelog_modified = kwargs.get('changelog_modified') self._set_paths(**kwargs) - if self.checks['changelog'] and not self.changelog_modified \ + if self.checks['changelog'] and not changelog_modified \ and self.ebuild_path in self.changed.new_ebuilds: self.qatracker.add_error('changelog.ebuildadded', self.relative_path) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 3d23725..86e389a 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -263,7 +263,7 @@ class Scanner(object): self.qatracker.add_error("changelog.missing", xpkg + "/ChangeLog") changelog_path = os.path.join(checkdir_relative, "ChangeLog") - self.changelog_modified = changelog_path in self.changed.changelogs + dynamic_data["changelog_modified"] = changelog_path in self.changed.changelogs self._scan_ebuilds(ebuildlist, dynamic_data) return dynamic_data['can_force']