Skip to content

Commit f7ee8c2

Browse files
committed
Resolve merge conflict
Update migration file Signed-off-by: ziad hany <ziadhany2016@gmail.com>
1 parent 36c4174 commit f7ee8c2

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

vulnerabilities/migrations/0104_packagecommitpatch_patch_and_more.py renamed to vulnerabilities/migrations/0105_packagecommitpatch_patch_and_more.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.25 on 2025-12-11 21:28
1+
# Generated by Django 4.2.25 on 2025-12-15 18:58
22

33
from django.db import migrations, models
44

55

66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
("vulnerabilities", "0103_codecommit_impactedpackage_affecting_commits_and_more"),
9+
("vulnerabilities", "0104_ssvc"),
1010
]
1111

1212
operations = [

vulnerabilities/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3467,6 +3467,7 @@ class AdvisoryExploit(models.Model):
34673467
def get_known_ransomware_campaign_use_type(self):
34683468
return "Known" if self.known_ransomware_campaign_use else "Unknown"
34693469

3470+
34703471
class SSVC(models.Model):
34713472
vector = models.CharField(max_length=255, help_text="The vector string representing the SSVC.")
34723473
options = models.JSONField(help_text="A JSON object containing the SSVC options.")

vulnerabilities/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,7 @@ def ssvc_calculator(ssvc_data):
797797
ssvc_vector += f"{timestamp_formatted}/"
798798
return ssvc_vector, decision
799799

800+
800801
def compute_patch_checksum(patch_text: str):
801802
"""
802803
Compute SHA-512 checksum for patch text.

0 commit comments

Comments
 (0)