Skip to content

Commit 03ee879

Browse files
committed
agent(rhel8): avoid the branch check
As it doesn't really work. Let's just check for one of the offending function's signature instead. Follow-up for 5bc17a8.
1 parent 5bc17a8 commit 03ee879

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

agent/bootstrap-rhel8.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,11 @@ git remote add upstream "https://github.com/systemd/systemd"
103103
git fetch upstream
104104
# test: make TEST-27 non-racy
105105
git show 324ca05459422b55cb6fa04318552541159c239a | git apply --verbose --recount || :
106-
if git diff --quiet ..remotes/origin/rhel-8.2.0 || git diff --quiet ..remotes/origin/rhel-8.4.0; then
106+
if grep -q "static int request_parse_arguments_iterator(" src/journal-remote/journal-gatewayd.c; then
107107
# Fix build with µhttpd 0.9.71
108108
git show ca86de228e19cea268ec3eeabc9097d7c28fbf24 | git apply --verbose --recount || :
109109
fi
110110

111-
112111
# It's impossible to keep the local SELinux policy database up-to-date with
113112
# arbitrary pull request branches we're testing against.
114113
# Disable SELinux on the test hosts and avoid false positives.

0 commit comments

Comments
 (0)