Skip to content

Commit e7f19e8

Browse files
committed
Fix grouping
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent c94a82f commit e7f19e8

2 files changed

Lines changed: 1 addition & 10 deletions

File tree

vulnerabilities/pipes/advisory.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,6 @@ def group_advisories_for_package_with_lock(
458458
group_advisory_for_package(
459459
pkg,
460460
logger=logger,
461-
current_advisory=advisory_obj,
462-
current_advisory_relation="affecting",
463461
)
464462
except Exception as e:
465463
logger(

vulnerabilities/pipes/group_advisories.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def delete_and_save_advisory_set(groups, package, relation=None):
6464

6565

6666
def group_advisory_for_package(
67-
package, logger=None, current_advisory=None, current_advisory_relation=None
67+
package, logger=None
6868
):
6969
"""
7070
Group advisories for a given package and save the advisory sets for the package.
@@ -90,13 +90,6 @@ def group_advisory_for_package(
9090
"impacted_packages__fixed_by_packages",
9191
)
9292

93-
if current_advisory and current_advisory_relation == "affecting":
94-
if not affecting_advisories.filter(id=current_advisory.id).exists():
95-
affecting_advisories = list(affecting_advisories) + [current_advisory]
96-
elif current_advisory and current_advisory_relation == "fixing":
97-
if not fixed_by_advisories.filter(id=current_advisory.id).exists():
98-
fixed_by_advisories = list(fixed_by_advisories) + [current_advisory]
99-
10093
try:
10194
affected_groups: List[Group] = merge_advisories(affecting_advisories, package)
10295
fixed_by_groups: List[Group] = merge_advisories(fixed_by_advisories, package)

0 commit comments

Comments
 (0)