Skip to content

Commit 07b01ae

Browse files
committed
fix: modules_presence needs to adjust trailing slash for findfiles() result on 3.27.0 and newer versions
Ticket: CFE-4623 Changelog: none
1 parent a84801a commit 07b01ae

3 files changed

Lines changed: 1 addition & 4 deletions

File tree

cfe_internal/update/update_policy.cf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ bundle agent modules_presence
808808
"_package_paths"
809809
with => ifelse( or( cf_version_between( "3.24.0", "3.24.3"),
810810
cf_version_at("3.26.0"),
811-
cf_version_at("3.27.0")), "$(const.dirsep)",
811+
cf_version_minimum("3.27.0")), "$(const.dirsep)",
812812
""),
813813
slist => filter("$(_override_dir)vendored$(with)", _package_paths_tmp, "false", "true", 999);
814814

ci/bootstrap-policy-run.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ FROM alpine
22
RUN apk add bash
33
COPY core /core
44
COPY masterfiles /masterfiles
5-
RUN ls /
6-
RUN find / -name core
75
RUN /core/ci/install.sh

ci/docker-bootstrap-policy-run.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ if docker images | grep mpf; then
2121
fi
2222

2323
# run the test
24-
ls "${NTECH_ROOT}"
2524
docker build -t mpf -f "${NTECH_ROOT}"/masterfiles/ci/bootstrap-policy-run.Dockerfile "${NTECH_ROOT}"
2625
docker run --workdir /masterfiles --tty mpf sh /masterfiles/ci/bootstrap-policy-run.sh
2726
if grep error *.log; then

0 commit comments

Comments
 (0)