1717
1818from pkgcheck import const as pkgcheck_const
1919from pkgcheck .addons import ArchesAddon , init_addon
20+ from pkgcheck .addons .git import GitAddedRepo , GitAddon , GitModifiedRepo
2021from pkgcheck .addons .profiles import ProfileAddon
21- from pkgcheck .addons .git import GitAddon , GitAddedRepo , GitModifiedRepo
22- from pkgcheck .checks import visibility , stablereq
22+ from pkgcheck .checks import stablereq , visibility
2323from pkgcheck .scripts import argparse_actions
2424from pkgcore .ebuild .atom import atom
2525from pkgcore .ebuild .ebuild_src import package
3737from snakeoil .osutils import pjoin
3838
3939from ..cli import ArgumentParser
40- from .argparsers import _determine_cwd_repo , cwd_repo_argparser , BugzillaApiKey
40+ from .argparsers import BugzillaApiKey , _determine_cwd_repo , cwd_repo_argparser
4141
4242bugs = ArgumentParser (
4343 prog = "pkgdev bugs" ,
@@ -401,7 +401,7 @@ def extend_targets_stable_groups(self, groups):
401401 except (ValueError , IndexError ):
402402 self .err .write (f"Unable to find match for { pkg .unversioned_atom } " )
403403
404- def _extend_projects (self , disabled , enabled ):
404+ def _extend_projects (self , disabled : frozenset [ str ] , enabled : frozenset [ str ] ):
405405 members = defaultdict (set )
406406 self .out .write ("Fetching projects.xml" )
407407 self .out .flush ()
@@ -410,15 +410,17 @@ def _extend_projects(self, disabled, enabled):
410410 for member in project .members :
411411 members [member .email ].add (email )
412412
413- disabled = frozenset ( disabled ) .union (* (members [email ] for email in disabled ))
414- enabled = frozenset ( enabled ) .union (* (members [email ] for email in enabled ))
413+ disabled = disabled .union (* (members [email ] for email in disabled ))
414+ enabled = enabled .union (* (members [email ] for email in enabled ))
415415 return disabled , enabled
416416
417417 def extend_maintainers (self ):
418418 disabled , enabled = self .options .find_by_maintainer
419+ disabled = frozenset ({e if "@" in e else f"{ e } @gentoo.org" for e in disabled })
420+ enabled = frozenset ({e if "@" in e else f"{ e } @gentoo.org" for e in enabled })
419421 if self .options .projects :
420422 disabled , enabled = self ._extend_projects (disabled , enabled )
421- emails = frozenset ( enabled ) .difference (disabled )
423+ emails = enabled .difference (disabled )
422424 if not emails :
423425 return
424426 search_repo = self .options .search_repo
@@ -530,7 +532,6 @@ def output_dot(self, dot_file: str):
530532 dot .close ()
531533
532534 def output_graph_toml (self ):
533- self .auto_cc_arches
534535 bugs = dict (enumerate (self .nodes , start = 1 ))
535536 reverse_bugs = {node : bugno for bugno , node in bugs .items ()}
536537
0 commit comments