Pushing unchanged additional resource fixes

Author: rislaed

toolchain/toolchain/python/icmtoolchain/device.py

@@ -173,15 +173,15 @@ def push_everything(push_unchanged: bool = True, cleanup_remote: bool = True) ->
 			elif isdir(project_path):
 				result = push_directory(project_path, remote_path, push_unchanged=remote_push_unchanged, cleanup_remote=remote_cleanup_remote, shell=shell)
 			else:
-				warn(f"* We cannot push {linked_resource['relative_path']} resource because we could not determine its type.")
+				print()
+				abort(f"We cannot push {linked_resource['relative_path']!r} resource because we could not determine its type!")
 			if result != 0:
 				return result
 		if len(shell.interactables) == 0:
 			progress = Progress("Up to date")
 			shell.interactables.append(progress)
 
-	if not push_unchanged:
-		GLOBALS.OUTPUT_STORAGE.save()
+	GLOBALS.OUTPUT_STORAGE.save()
 	return 0
 
 def push_file(file: str, destination_file: str, push_unchanged: bool = True, cleanup_remote: bool = True, shell: Optional[Shell] = None) -> int:

toolchain/toolchain/python/icmtoolchain/mod_structure.py

@@ -1,13 +1,13 @@
-from collections import namedtuple
 import json
 import os
-from os.path import isdir, isfile, join, relpath, basename
+from collections import namedtuple
+from os.path import basename, isdir, isfile, join, relpath
 from typing import Any, Collection, Dict, Final, List, Optional
 
 from . import GLOBALS
 from .shell import warn
-from .utils import ensure_directory, ensure_file, ensure_file_directory, remove_tree
-
+from .utils import (ensure_directory, ensure_file, ensure_file_directory,
+                    remove_tree)
 
 BuildTargetType = namedtuple("BuildTargetType", "directory property")
 
@@ -202,7 +202,7 @@ def append_resource(self, relative_path: str, output_path: str, **properties: An
 		self.contents.append({
 			"relative_path": relative_path,
 			"output_path": output_path,
-			**properties
+			**{ key: value for key, value in properties.items() if value is not None }
 		})
 
 	def iterate_resources(self):