diff --git a/configure/E3/DEFINES_FT b/configure/E3/DEFINES_FT index 62d39e5d92dd9e03641ccd062c4994fb59fccab5..0d0e6474164310081ec50af5b8bb7a139e8a2806 100644 --- a/configure/E3/DEFINES_FT +++ b/configure/E3/DEFINES_FT @@ -13,7 +13,7 @@ git submodule update --remote --merge $@/ endef define patch_site -patches=$$(ls $(TOP)/patch/Site/*.p0.patch 2> /dev/null); \ +patches=$$(ls $(TOP)/patch/*.p0.patch 2> /dev/null); \ if [ -n "$$patches" ]; then \ for i in $$patches; do \ printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ @@ -25,7 +25,7 @@ fi endef define patch_revert_site -patches=$$(ls $(TOP)/patch/Site/*.p0.patch 2> /dev/null); \ +patches=$$(ls $(TOP)/patch/*.p0.patch 2> /dev/null); \ if [ -n "$$patches" ]; then \ for i in $$patches; do\ printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ diff --git a/tests/test_build.py b/tests/test_build.py index eb3386e609dd011236a8ab70cf6104da9ff0e15f..f58cb98ca7b7fc709ae2744d3023b6160c826052 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -35,7 +35,7 @@ def test_patch(wrapper): with open(db_path, "w") as f: f.write(db_file_contents) - patch_dir = wrapper.path / "patch" / "Site" + patch_dir = wrapper.path / "patch" create_patch_file(patch_dir / "apply.p0.patch", "OK") create_patch_file(patch_dir / MODULE_VERSION / "do-not-apply.p0.patch", "Bad")