Skip to content

bugs: fix open bug search with deps #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joecool1029 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugs: fix open bug search with deps #223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/pkgdev/scripts/pkgdev_bugs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,8 @@ def merge_new_keywords_children(self):
for node, origs in reverse_edges.items():
if len(origs) != 1:
continue
if node.bugno is not None:
continue
existing_keywords = frozenset().union(
*(
pkgver.keywords
Expand All @@ -665,6 +667,8 @@ def merge_new_keywords_children(self):
if existing_keywords & frozenset().union(*(pkg[1] for pkg in node.pkgs)):
continue # not fully new keywords
orig = next(iter(origs))
if orig.bugno is not None:
continue
self.out.write(f"Merging {node} into {orig}")
self.merge_nodes((orig, node))
found_someone = True
Expand All @@ -674,7 +678,9 @@ def merge_stabilization_groups(self):
for group, pkgs in self.options.repo.stabilization_groups.items():
restrict = packages.OrRestriction(*pkgs)
mergable = tuple(
node for node in self.nodes if any(restrict.match(pkg) for pkg, _ in node.pkgs)
node
for node in self.nodes
if node.bugno is None and any(restrict.match(pkg) for pkg, _ in node.pkgs)
)
if mergable:
self.out.write(f"Merging @{group} group nodes: {mergable}")
Expand Down Expand Up @@ -758,9 +764,6 @@ def main(options, out: Formatter, err: Formatter):
options.targets = list(_load_from_stdin(out))
d.load_targets(options.targets)
d.build_full_graph()
d.merge_stabilization_groups()
d.merge_cycles()
d.merge_new_keywords_children()

if not d.nodes:
out.write(out.fg("red"), "Nothing to do, exiting", out.reset)
Expand All @@ -769,6 +772,10 @@ def main(options, out: Formatter, err: Formatter):
if userquery("Check for open bugs matching current graph?", out, err, default_answer=False):
d.scan_existing_bugs(options.api_key)

d.merge_stabilization_groups()
d.merge_cycles()
d.merge_new_keywords_children()

if options.edit_graph:
toml = d.output_graph_toml()

Expand Down