[Blends-commit] [Git][blends-team/blends][master] 2 commits: Really fix spacing

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Blends Team / blends


Commits:
f0726bcc by Andreas Tille at 2024-04-22T19:57:17+02:00
Really fix spacing

- - - - -
5729e18a by Andreas Tille at 2024-04-22T20:26:06+02:00
Work around possibly missing key "conflicts"

- - - - -


1 changed file:

- devtools/tasks_diff


Changes:

=====================================
devtools/tasks_diff
=====================================
@@ -89,10 +89,10 @@ def load_task(path_to_task):
 		if "recommends" in paragraph:
 			taskinfo["recommends"] += clean_up_packages(paragraph["recommends"])
 
-	if "conflicts" in paragraph:
+		if "conflicts" in paragraph:
 			taskinfo["conflicts"] += clean_up_packages(paragraph["conflicts"])
 
-	if "breaks" in paragraph:
+		if "breaks" in paragraph:
 			taskinfo["breaks"] += clean_up_packages(paragraph["breaks"])
 
 		if "ignore" in paragraph:
@@ -118,7 +118,10 @@ def compare_tasks(tasks, tasks_compare, taskprefix):
 		task_first = True 
 		first_add = True
 		for header in ["depends", "recommends", "suggests", "conflicts", "breaks", "ignore", "avoid"]:
-			added =  set(tasks[task][header]) - set(tasks_compare[task][header])
+			try:
+				added =  set(tasks[task][header]) - set(tasks_compare[task][header])
+			except:
+				continue # if some key is missing
 			if added:
 				if first_print:
 					print(START_FLAG, "\n")
@@ -135,7 +138,10 @@ def compare_tasks(tasks, tasks_compare, taskprefix):
 		
 		first_remove = True
 		for header in ["depends", "recommends", "suggests", "conflicts", "breaks", "ignore", "avoid"]:
-			removed =  set(tasks_compare[task][header]) - set(tasks[task][header])
+			try:
+				removed =  set(tasks_compare[task][header]) - set(tasks[task][header])
+			except:
+				continue # if some key is missing
 			if removed:
 				if first_print:
 					print(START_FLAG, "\n")



View it on GitLab: https://salsa.debian.org/blends-team/blends/-/compare/cacbc3f4e856c5bea51783aa4c23fbafdc2a3031...5729e18a2f70df486bdc7041cbd13c0cfca2557b

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/blends-team/blends/-/compare/cacbc3f4e856c5bea51783aa4c23fbafdc2a3031...5729e18a2f70df486bdc7041cbd13c0cfca2557b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/blends-commit/attachments/20240518/46c56a7d/attachment-0001.htm>