* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/
@ 2016-03-11 0:41 Brian Dolbec
0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2016-03-11 0:41 UTC (permalink / raw
To: gentoo-commits
commit: 6812f3b0509398dc14b6b31403d89b7d968fb153
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: Fri Mar 11 00:38:10 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6812f3b0
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']
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/
@ 2016-03-11 1:07 Brian Dolbec
0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2016-03-11 1:07 UTC (permalink / raw
To: gentoo-commits
commit: ea7322c51334fb49d81d5441e30ce96ae9d2fed3
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: Fri Mar 11 01:05:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ea7322c5
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']
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/
@ 2016-04-21 16:54 Brian Dolbec
0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2016-04-21 16:54 UTC (permalink / raw
To: gentoo-commits
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']
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/
@ 2016-04-21 16:54 Brian Dolbec
0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2016-04-21 16:54 UTC (permalink / raw
To: gentoo-commits
commit: 1f9d957d838ea7ade379686caedf050d71b1325d
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 02:00:20 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 16:49:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1f9d957d
repoman: Migrate 'can_force' to the new Fuse class
pym/repoman/main.py | 5 +++--
pym/repoman/modules/scan/ebuild/isebuild.py | 5 +++--
pym/repoman/scanner.py | 3 +--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 337e638..2ccda99 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -25,6 +25,7 @@ from portage.util import formatter
from repoman.actions import Actions
from repoman.argparser import parse_args
+from repoman.fuse import Fuse
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats)
@@ -75,7 +76,7 @@ def repoman_main(argv):
# Set this to False when an extraordinary issue (generally
# something other than a QA issue) makes it impossible to
# commit (like if Manifest generation fails).
- can_force = True
+ can_force = Fuse()
portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
if portdir is None:
@@ -110,7 +111,7 @@ def repoman_main(argv):
# Perform the main checks
scanner = Scanner(repo_settings, myreporoot, config_root, options,
vcs_settings, mydir, env)
- can_force = scanner.scan_pkgs(can_force)
+ scanner.scan_pkgs(can_force)
commitmessage = None
diff --git a/pym/repoman/modules/scan/ebuild/isebuild.py b/pym/repoman/modules/scan/ebuild/isebuild.py
index 474a874..514d23e 100644
--- a/pym/repoman/modules/scan/ebuild/isebuild.py
+++ b/pym/repoman/modules/scan/ebuild/isebuild.py
@@ -42,6 +42,7 @@ class IsEbuild(ScanBase):
checkdir = kwargs.get('checkdir')
xpkg = kwargs.get('xpkg')
fuse = kwargs.get('validity_fuse')
+ can_force = kwargs.get('can_force')
self.continue_ = False
ebuildlist = []
pkgs = {}
@@ -85,9 +86,9 @@ class IsEbuild(ScanBase):
# metadata leads to false positives for several checks, and false
# positives confuse users.
self.continue_ = True
+ can_force.pop()
- return {'continue': self.continue_, 'pkgs': pkgs,
- 'can_force': not self.continue_}
+ return {'continue': self.continue_, 'pkgs': pkgs}
@property
def runInPkgs(self):
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 9c6f5ac..a9f56e9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -205,7 +205,6 @@ class Scanner(object):
self.modules[mod_class.__name__] = mod_class(**self.kwargs)
def scan_pkgs(self, can_force):
- dynamic_data = {'can_force': can_force}
for xpkg in self.effective_scanlist:
xpkg_continue = False
# ebuilds and digests added to cvs respectively.
@@ -268,7 +267,7 @@ class Scanner(object):
dynamic_data["changelog_modified"] = changelog_path in self.changed.changelogs
self._scan_ebuilds(ebuildlist, dynamic_data)
- return dynamic_data['can_force']
+ return
def _scan_ebuilds(self, ebuildlist, dynamic_data):
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/
@ 2016-04-25 15:32 Brian Dolbec
0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2016-04-25 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 45f57e9b8dc5c582e786a7eb7d8679abd59958fe
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 02:00:20 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 15:28:53 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=45f57e9b
repoman: Migrate 'can_force' to the new Fuse class
pym/repoman/main.py | 5 +++--
pym/repoman/modules/scan/ebuild/isebuild.py | 5 +++--
pym/repoman/scanner.py | 3 +--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 337e638..2ccda99 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -25,6 +25,7 @@ from portage.util import formatter
from repoman.actions import Actions
from repoman.argparser import parse_args
+from repoman.fuse import Fuse
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats)
@@ -75,7 +76,7 @@ def repoman_main(argv):
# Set this to False when an extraordinary issue (generally
# something other than a QA issue) makes it impossible to
# commit (like if Manifest generation fails).
- can_force = True
+ can_force = Fuse()
portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
if portdir is None:
@@ -110,7 +111,7 @@ def repoman_main(argv):
# Perform the main checks
scanner = Scanner(repo_settings, myreporoot, config_root, options,
vcs_settings, mydir, env)
- can_force = scanner.scan_pkgs(can_force)
+ scanner.scan_pkgs(can_force)
commitmessage = None
diff --git a/pym/repoman/modules/scan/ebuild/isebuild.py b/pym/repoman/modules/scan/ebuild/isebuild.py
index 474a874..514d23e 100644
--- a/pym/repoman/modules/scan/ebuild/isebuild.py
+++ b/pym/repoman/modules/scan/ebuild/isebuild.py
@@ -42,6 +42,7 @@ class IsEbuild(ScanBase):
checkdir = kwargs.get('checkdir')
xpkg = kwargs.get('xpkg')
fuse = kwargs.get('validity_fuse')
+ can_force = kwargs.get('can_force')
self.continue_ = False
ebuildlist = []
pkgs = {}
@@ -85,9 +86,9 @@ class IsEbuild(ScanBase):
# metadata leads to false positives for several checks, and false
# positives confuse users.
self.continue_ = True
+ can_force.pop()
- return {'continue': self.continue_, 'pkgs': pkgs,
- 'can_force': not self.continue_}
+ return {'continue': self.continue_, 'pkgs': pkgs}
@property
def runInPkgs(self):
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 9c6f5ac..a9f56e9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -205,7 +205,6 @@ class Scanner(object):
self.modules[mod_class.__name__] = mod_class(**self.kwargs)
def scan_pkgs(self, can_force):
- dynamic_data = {'can_force': can_force}
for xpkg in self.effective_scanlist:
xpkg_continue = False
# ebuilds and digests added to cvs respectively.
@@ -268,7 +267,7 @@ class Scanner(object):
dynamic_data["changelog_modified"] = changelog_path in self.changed.changelogs
self._scan_ebuilds(ebuildlist, dynamic_data)
- return dynamic_data['can_force']
+ return
def _scan_ebuilds(self, ebuildlist, dynamic_data):
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-04-25 15:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-21 16:54 [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2016-04-25 15:32 Brian Dolbec
2016-04-21 16:54 Brian Dolbec
2016-03-11 1:07 Brian Dolbec
2016-03-11 0:41 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox