From 7cf3b04a69bdc96872aca5a1c4416833cb3abe94 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 30 May 2022 16:01:29 +0200
Subject: [PATCH] Removed 'Site' dir
---
configure/E3/DEFINES_FT | 4 ++--
tests/test_build.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure/E3/DEFINES_FT b/configure/E3/DEFINES_FT
index 62d39e5d..0d0e6474 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 eb3386e6..f58cb98c 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")
--
GitLab