commit: 38d18a1156787011bf25e5942aabbc262912a32b Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Fri Mar 11 00:11:13 2016 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Thu Apr 21 16:49:29 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=38d18a11
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']