Merge branch 'develop2' into frm/win_gh_actions

conan-io · Nov 8, 2024 · ae02449 · ae02449
2 parents b4f9619 + c74f05f
commit ae02449
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/conan/tools/files/patches.py b/conan/tools/files/patches.py
@@ -142,5 +142,7 @@ def export_conandata_patches(conanfile):
         if patch_file:
             src = os.path.join(conanfile.recipe_folder, patch_file)
             dst = os.path.join(conanfile.export_sources_folder, patch_file)
+            if not os.path.exists(src):
+                raise ConanException(f"Patch file does not exist: '{src}'")
             mkdir(os.path.dirname(dst))
             shutil.copy2(src, dst)
diff --git a/test/functional/tools/test_files.py b/test/functional/tools/test_files.py
@@ -407,7 +407,7 @@ def source(self):
     # No patch found
     client.save({"conandata.yml": conandata_yml})
     client.run("create .", assert_error=True)
-    assert "No such file or directory" in client.out
+    assert "Patch file does not exist: '" in client.out
 
     client.save({"patches/mypatch.patch": "mypatch!!!"})
     client.run("create .")