Skip to content

Commit 84b3cbd

Browse files
Merge pull request #16 from brianhlin/HTCONDOR-451.remove-duplicate-patch
Remove duplicate patch
2 parents e1ee8ea + 76318f9 commit 84b3cbd

File tree

2 files changed

+1
-41
lines changed

2 files changed

+1
-41
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ RUN [[ $BASE_YUM_REPO != 'release' ]] || patch -d / -p0 < /tmp/HTCONDOR-242.remo
115115
# Required for HTCondor 9.0.0 on the CE and Bosco 1.3 usage
116116
# Can be dropped when HTCONDOR-451 has been fixed and released in the OSG
117117
COPY hosted-ce/overrides/HTCONDOR-451.allow-batch_gahp.patch /tmp
118-
COPY hosted-ce/overrides/HTCONDOR-451.allow-batch_gahp-2.patch /tmp
119-
RUN [[ $BASE_YUM_REPO == 'release' ]] || { patch -d / -p0 < /tmp/HTCONDOR-451.allow-batch_gahp.patch && patch -d / -p0 < /tmp/HTCONDOR-451.allow-batch_gahp-2.patch; }
118+
RUN [[ $BASE_YUM_REPO == 'release' ]] || patch -d / -p0 < /tmp/HTCONDOR-451.allow-batch_gahp.patch
120119

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

hosted-ce/overrides/HTCONDOR-451.allow-batch_gahp-2.patch

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)