| 1 |
commit: baa93beabed3da1186683c0a4ea9e6fed4d3fbda |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 11 00:11:13 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 25 15:28:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=baa93bea |
| 7 |
|
| 8 |
repoman: Move changelog_modified to dynamic_data for use in the scan/ebuild module |
| 9 |
|
| 10 |
pym/repoman/modules/scan/ebuild/ebuild.py | 3 ++- |
| 11 |
pym/repoman/scanner.py | 2 +- |
| 12 |
2 files changed, 3 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py b/pym/repoman/modules/scan/ebuild/ebuild.py |
| 15 |
index 0ae416b..e9a2cdd 100644 |
| 16 |
--- a/pym/repoman/modules/scan/ebuild/ebuild.py |
| 17 |
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py |
| 18 |
@@ -74,9 +74,10 @@ class Ebuild(ScanBase): |
| 19 |
self.xpkg = kwargs.get('xpkg') |
| 20 |
self.y_ebuild = kwargs.get('y_ebuild') |
| 21 |
self.changed = kwargs.get('changed') |
| 22 |
+ changelog_modified = kwargs.get('changelog_modified') |
| 23 |
self._set_paths(**kwargs) |
| 24 |
|
| 25 |
- if self.checks['changelog'] and not self.changelog_modified \ |
| 26 |
+ if self.checks['changelog'] and not changelog_modified \ |
| 27 |
and self.ebuild_path in self.changed.new_ebuilds: |
| 28 |
self.qatracker.add_error('changelog.ebuildadded', self.relative_path) |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py |
| 32 |
index 3d23725..86e389a 100644 |
| 33 |
--- a/pym/repoman/scanner.py |
| 34 |
+++ b/pym/repoman/scanner.py |
| 35 |
@@ -263,7 +263,7 @@ class Scanner(object): |
| 36 |
self.qatracker.add_error("changelog.missing", xpkg + "/ChangeLog") |
| 37 |
|
| 38 |
changelog_path = os.path.join(checkdir_relative, "ChangeLog") |
| 39 |
- self.changelog_modified = changelog_path in self.changed.changelogs |
| 40 |
+ dynamic_data["changelog_modified"] = changelog_path in self.changed.changelogs |
| 41 |
|
| 42 |
self._scan_ebuilds(ebuildlist, dynamic_data) |
| 43 |
return dynamic_data['can_force'] |
Archives