* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/
@ 2016-03-16 17:12 Brian Dolbec
0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2016-03-16 17:12 UTC (permalink / raw
To: gentoo-commits
commit: a7ef584f8ee03d026d29e814beeb947e791dfe54
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 20:12:54 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 20:12:54 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7ef584f
profile.py docstring fix
pym/repoman/modules/scan/depend/profile.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/pym/repoman/modules/scan/depend/profile.py b/pym/repoman/modules/scan/depend/profile.py
index c202377..1879084 100644
--- a/pym/repoman/modules/scan/depend/profile.py
+++ b/pym/repoman/modules/scan/depend/profile.py
@@ -24,7 +24,6 @@ class ProfileDependsChecks(object):
@param qatracker: QATracker instance
@param repo_settings: repository settings instance
@param vcs_settings: VCSSettings instance
- @param changed: changes dictionary
@param checks: checks dictionary
@param portdb: portdb instance
@param profiles: dictionary
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/
@ 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: 206210006fde7b4e238b84eaa516844ba1c9052b
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 07:32:54 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 16:51:35 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=20621000
repoman: Remove 'type_list' from dynamic_data
IT was not used outside of the DependChecks.check()
pym/repoman/modules/scan/depend/__init__.py | 3 +--
pym/repoman/modules/scan/depend/depend.py | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py
index 735604d..cf5b415 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -21,8 +21,7 @@ module_spec = {
'mod_kwargs': ['qatracker', 'portdb'
],
'func_kwargs': {'ebuild': None, 'pkg': None, 'unknown_pkgs': 'set',
- 'type_list': 'list', 'badlicsyntax': 'Future',
- 'baddepsyntax': 'Future',
+ 'badlicsyntax': 'Future', 'baddepsyntax': 'Future',
},
},
'profile-module': {
diff --git a/pym/repoman/modules/scan/depend/depend.py b/pym/repoman/modules/scan/depend/depend.py
index 0efe5de..a5f91d3 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -146,8 +146,6 @@ class DependChecks(ScanBase):
# update the dynamic data
dyn_unknown = kwargs.get('unknown_pkgs')
dyn_unknown.update(unknown_pkgs)
- dyn_type_list = kwargs.get('type_list')
- dyn_type_list.extend(type_list)
self.set_result_pass([
(kwargs.get('badlicsyntax'), badlicsyntax),
(kwargs.get('baddepsyntax'), baddepsyntax),
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/
@ 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: 902abebcad19a0d598103664a6afcdb0fc211edc
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 07:32:54 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=902abebc
repoman: Remove 'type_list' from dynamic_data
IT was not used outside of the DependChecks.check()
pym/repoman/modules/scan/depend/__init__.py | 3 +--
pym/repoman/modules/scan/depend/depend.py | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py
index 735604d..cf5b415 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -21,8 +21,7 @@ module_spec = {
'mod_kwargs': ['qatracker', 'portdb'
],
'func_kwargs': {'ebuild': None, 'pkg': None, 'unknown_pkgs': 'set',
- 'type_list': 'list', 'badlicsyntax': 'Future',
- 'baddepsyntax': 'Future',
+ 'badlicsyntax': 'Future', 'baddepsyntax': 'Future',
},
},
'profile-module': {
diff --git a/pym/repoman/modules/scan/depend/depend.py b/pym/repoman/modules/scan/depend/depend.py
index 0efe5de..a5f91d3 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -146,8 +146,6 @@ class DependChecks(ScanBase):
# update the dynamic data
dyn_unknown = kwargs.get('unknown_pkgs')
dyn_unknown.update(unknown_pkgs)
- dyn_type_list = kwargs.get('type_list')
- dyn_type_list.extend(type_list)
self.set_result_pass([
(kwargs.get('badlicsyntax'), badlicsyntax),
(kwargs.get('baddepsyntax'), baddepsyntax),
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/
@ 2016-04-25 17:02 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2016-04-25 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 260574004ff6c4dc5187fdf579851d920788fff4
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 17:02:26 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 17:02:26 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=26057400
repoman: remove DependUnknown (part of ProfileDependsChecks now)
pym/repoman/modules/scan/depend/unknown.py | 41 ------------------------------
1 file changed, 41 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/unknown.py b/pym/repoman/modules/scan/depend/unknown.py
deleted file mode 100644
index 6667d4f..0000000
--- a/pym/repoman/modules/scan/depend/unknown.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from repoman.modules.scan.scanbase import ScanBase
-
-
-class DependUnknown(ScanBase):
- '''Perform checks to determine unknown dependencies'''
-
- def __init__(self, **kwargs):
- '''Class init
-
- @param qatracker: QATracker instance
- '''
- self.qatracker = kwargs.get('qatracker')
-
- def check(self, **kwargs):
- '''Perform unknown dependancy checks
-
- @param ebuild: Future.result == Ebuild which we check (object).
- @param baddepsyntax: Future.result == boolean
- @param unknown_pkgs: set of tuples (type, atom.unevaluated_atom)
- @returns: dictionary
- '''
- ebuild = kwargs.get('ebuild').get()
- baddepsyntax = kwargs.get('baddepsyntax').get()
- unknown_pkgs = kwargs.get('unknown_pkgs').get()
-
- if not baddepsyntax and unknown_pkgs:
- type_map = {}
- for mytype, atom in unknown_pkgs:
- type_map.setdefault(mytype, set()).add(atom)
- for mytype, atoms in type_map.items():
- self.qatracker.add_error(
- "dependency.unknown", "%s: %s: %s"
- % (ebuild.relative_path, mytype, ", ".join(sorted(atoms))))
- return False
-
- @property
- def runInEbuilds(self):
- '''Ebuild level scans'''
- return (True, [self.check])
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/
@ 2016-05-14 18:33 Brian Dolbec
0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2016-05-14 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 70704ab3f8983dd69a4742cd4c3a0810e4eed7e5
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 20:51:39 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue May 10 17:53:45 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=70704ab3
repoman: filter out duplicate dependencies in error messages
Some packages list the same atom multiple times (e.g. behind diff USE
flags). If one of them throws an error, we end up listing it more than
once, and the output can get verbose/useless.
pym/repoman/modules/scan/depend/profile.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/profile.py b/pym/repoman/modules/scan/depend/profile.py
index 5b32f66..a714a93 100644
--- a/pym/repoman/modules/scan/depend/profile.py
+++ b/pym/repoman/modules/scan/depend/profile.py
@@ -201,13 +201,22 @@ class ProfileDependsChecks(ScanBase):
# we have some unsolvable deps
# remove ! deps, which always show up as unsatisfiable
- atoms = [
+ all_atoms = [
str(atom.unevaluated_atom)
for atom in atoms if not atom.blocker]
# if we emptied out our list, continue:
- if not atoms:
+ if not all_atoms:
continue
+
+ # Filter out duplicates. We do this by hand (rather
+ # than use a set) so the order is stable and better
+ # matches the order that's in the ebuild itself.
+ atoms = []
+ for atom in all_atoms:
+ if atom not in atoms:
+ atoms.append(atom)
+
if self.options.output_style in ['column']:
self.qatracker.add_error(mykey,
"%s: %s: %s(%s) %s"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-14 18:34 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/modules/scan/depend/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2016-05-14 18:33 Brian Dolbec
2016-04-25 17:02 Zac Medico
2016-04-25 15:32 Brian Dolbec
2016-03-16 17:12 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox