Skip to content

Commit 3cd48d5

Browse files
committed
Skip patch that made it into HTCondor 8.9.12
1 parent 01b55fc commit 3cd48d5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

hosted-ce/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN patch -d / -p0 < /tmp/skip_key_copy.patch
3434
# Fix Ubuntu20 OS detection (SOFTWARE-4463)
3535
# Can be dropped when HTCONDOR-242 is involved
3636
COPY overrides/HTCONDOR-242.remote-os-detection.patch /tmp
37-
RUN patch -d / -p0 < /tmp/HTCONDOR-242.remote-os-detection.patch
37+
RUN [[ $BASE_YUM_REPO == 'development' ]] || patch -d / -p0 < /tmp/HTCONDOR-242.remote-os-detection.patch
3838

3939
# Set up Bosco override dir from Git repo (SOFTWARE-3903)
4040
# Expects a Git repo with the following directory structure:

0 commit comments

Comments
 (0)