Skip to content

Commit 06e77cd

Browse files
authored
Merge pull request #13 from brianhlin/fix-patching
HTCONDOR-242 patch doesn't apply to HTCondor 9.0.0
2 parents 6afe571 + 2b0c95f commit 06e77cd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ RUN patch -d / -p0 < /tmp/skip_key_copy.patch
107107
# Fix Ubuntu20 OS detection (SOFTWARE-4463)
108108
# Can be dropped when HTCONDOR-242 is involved
109109
COPY hosted-ce/overrides/HTCONDOR-242.remote-os-detection.patch /tmp
110-
RUN [[ $BASE_YUM_REPO == 'development' ]] || patch -d / -p0 < /tmp/HTCONDOR-242.remote-os-detection.patch
110+
RUN [[ $BASE_YUM_REPO != 'release' ]] || patch -d / -p0 < /tmp/HTCONDOR-242.remote-os-detection.patch
111111

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

0 commit comments

Comments
 (0)