Skip to content
Snippets Groups Projects
Commit 7cf3b04a authored by Simon Rose's avatar Simon Rose
Browse files

Removed 'Site' dir

parent 30c7df71
No related branches found
No related tags found
1 merge request!87E3-847: Apply all the patches
......@@ -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"; \
......
......@@ -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")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment