Skip to content

Commit 322c966

Browse files
committed
Resolve migration conflict
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent 00c92aa commit 322c966

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

vulnerabilities/migrations/0089_advisorytodo.py renamed to vulnerabilities/migrations/0093_advisorytodo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Generated by Django 4.2.17 on 2025-01-27 18:04
1+
# Generated by Django 4.2.20 on 2025-06-03 17:36
22

33
from django.db import migrations, models
44

55

66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
("vulnerabilities", "0088_fix_alpine_purl_type"),
9+
("vulnerabilities", "0092_pipelineschedule_pipelinerun"),
1010
]
1111

1212
operations = [

vulnerabilities/models.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2260,23 +2260,22 @@ def create_new_job(self, execute_now=False):
22602260
return schedules.schedule_execution(self, execute_now) if self.is_active else None
22612261

22622262

2263-
class AdvisoryTODO(models.Model):
2264-
ISSUE_TYPE_CHOICES = [
2265-
("MISSING_AFFECTED_PACKAGE", "Advisory is missing affected package"),
2266-
("MISSING_FIXED_BY_PACKAGE", "Advisory is missing fixed-by package"),
2267-
(
2268-
"MISSING_AFFECTED_AND_FIXED_BY_PACKAGES",
2269-
"Advisory is missing both affected and fixed-by packages",
2270-
),
2271-
("MISSING_SUMMARY", "Advisory is missing summary"),
2272-
("CONFLICTING_FIXED_BY_PACKAGES", "Advisories have conflicting fixed-by packages"),
2273-
("CONFLICTING_AFFECTED_PACKAGES", "Advisories have conflicting affected packages"),
2274-
(
2275-
"CONFLICTING_AFFECTED_AND_FIXED_BY_PACKAGES",
2276-
"Advisories have conflicting affected and fixed-by packages",
2277-
),
2278-
("CONFLICTING_SEVERITY_SCORES", "Advisories have conflicting severity scores"),
2279-
]
2263+
ISSUE_TYPE_CHOICES = [
2264+
("MISSING_AFFECTED_PACKAGE", "Advisory is missing affected package"),
2265+
("MISSING_FIXED_BY_PACKAGE", "Advisory is missing fixed-by package"),
2266+
(
2267+
"MISSING_AFFECTED_AND_FIXED_BY_PACKAGES",
2268+
"Advisory is missing both affected and fixed-by packages",
2269+
),
2270+
("MISSING_SUMMARY", "Advisory is missing summary"),
2271+
("CONFLICTING_FIXED_BY_PACKAGES", "Advisories have conflicting fixed-by packages"),
2272+
("CONFLICTING_AFFECTED_PACKAGES", "Advisories have conflicting affected packages"),
2273+
(
2274+
"CONFLICTING_AFFECTED_AND_FIXED_BY_PACKAGES",
2275+
"Advisories have conflicting affected and fixed-by packages",
2276+
),
2277+
("CONFLICTING_SEVERITY_SCORES", "Advisories have conflicting severity scores"),
2278+
]
22802279

22812280

22822281
class AdvisoryToDo(models.Model):

0 commit comments

Comments
 (0)