gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #69687 from tchaikov/wip-cpatch-esc-seq

Browse Source 
script: fix invalid escape sequences

Reviewed-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
Kefu Chai 2026-06-25 14:37:33 +08:00 committed by GitHub
commit ed1cdc5478
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/cpatch.py
View File

@ -462,12 +462,12 @@ class Builder:
if os.path.isdir(self._workdir / "tmp_bin"):
# For every binary file that was copied to the tmp_bin directory by the jobs above, search for the existing file in the container and replace it.
dlines.append("ADD tmp_bin /tmpbin")
dlines.append("RUN for i in tmpbin/*; do find /usr/bin /usr/sbin -name $(basename $i) -exec mv -f $i '{}' \;; echo $(basename $i); done && rm -rf tmpbin")
dlines.append(r"RUN for i in tmpbin/*; do find /usr/bin /usr/sbin -name $(basename $i) -exec mv -f $i '{}' \;; echo $(basename $i); done && rm -rf tmpbin")
if os.path.isdir(self._workdir / "tmp_lib"):
# For every library file that was copied to the tmp_lib directory by the jobs above, search for the existing file in the container and replace it.
dlines.append("ADD tmp_lib /tmplib")
dlines.append("RUN for i in tmplib/*; do find /usr/lib64 -name $(basename $i) -exec mv -f $i '{}' \;; echo $(basename $i); done && rm -rf tmplib")
dlines.append(r"RUN for i in tmplib/*; do find /usr/lib64 -name $(basename $i) -exec mv -f $i '{}' \;; echo $(basename $i); done && rm -rf tmplib")
if os.path.isdir(self._workdir / "tmp_bin"):
# by default locally built binaries assume /usr/local