From 2a004cac3bdf45135ac92cd04bb26f14a7a98875 Mon Sep 17 00:00:00 2001 From: naftali-hershler Date: Thu, 7 Nov 2024 11:52:59 +0200 Subject: [PATCH 1/2] CM-41217 Add absolute path to document --- cycode/cli/files_collector/sca/base_restore_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cycode/cli/files_collector/sca/base_restore_dependencies.py b/cycode/cli/files_collector/sca/base_restore_dependencies.py index e0d7558a..6db1a678 100644 --- a/cycode/cli/files_collector/sca/base_restore_dependencies.py +++ b/cycode/cli/files_collector/sca/base_restore_dependencies.py @@ -54,7 +54,7 @@ def get_manifest_file_path(self, document: Document) -> str: def try_restore_dependencies(self, document: Document) -> Optional[Document]: manifest_file_path = self.get_manifest_file_path(document) - restore_file_path = build_dep_tree_path(document.path, self.get_lock_file_name()) + restore_file_path = build_dep_tree_path(document.absolute_path, self.get_lock_file_name()) working_directory_path = self.get_working_directory(document) if self.verify_restore_file_already_exist(restore_file_path): From c89c81efcc4044c255a537885655bb3f6ca43628 Mon Sep 17 00:00:00 2001 From: naftali-hershler Date: Thu, 7 Nov 2024 16:42:26 +0200 Subject: [PATCH 2/2] CM-41217 Fix absolute path --- cycode/cli/files_collector/sca/base_restore_dependencies.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cycode/cli/files_collector/sca/base_restore_dependencies.py b/cycode/cli/files_collector/sca/base_restore_dependencies.py index 6db1a678..b320e029 100644 --- a/cycode/cli/files_collector/sca/base_restore_dependencies.py +++ b/cycode/cli/files_collector/sca/base_restore_dependencies.py @@ -55,6 +55,7 @@ def get_manifest_file_path(self, document: Document) -> str: def try_restore_dependencies(self, document: Document) -> Optional[Document]: manifest_file_path = self.get_manifest_file_path(document) restore_file_path = build_dep_tree_path(document.absolute_path, self.get_lock_file_name()) + relative_restore_file_path = build_dep_tree_path(document.path, self.get_lock_file_name()) working_directory_path = self.get_working_directory(document) if self.verify_restore_file_already_exist(restore_file_path): @@ -70,7 +71,7 @@ def try_restore_dependencies(self, document: Document) -> Optional[Document]: ) restore_file_content = get_file_content(restore_file_path) - return Document(restore_file_path, restore_file_content, self.is_git_diff) + return Document(relative_restore_file_path, restore_file_content, self.is_git_diff) def get_working_directory(self, document: Document) -> Optional[str]: return None