From f9447edf47d28bd590b184bb9df2a35d386cc69c Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 17 Jun 2022 08:22:30 +0200 Subject: [PATCH] Remove materials before import This ensures that there won't be any old materials present if they're deleted between versions. Contributes to CURA-9365 --- conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conanfile.py b/conanfile.py index 618e014c9e..b4f82ee104 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,6 +6,7 @@ from platform import python_version from jinja2 import Template from conan import ConanFile +from conan.tools import files from conans import tools from conan.errors import ConanInvalidConfiguration @@ -177,6 +178,7 @@ class CuraConan(ConanFile): self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) self.copy("CuraEngine", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) + files.rmdir(self, "resources/materials") self.copy("*.fdm_material", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False) self.copy("*.sig", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False)