Fixed a make clean regression
#77137
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
release-note-none
|
/sig testing |
k8s-ci-robot
added
sig/testing
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fejta, Huang-Wei The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
BenTheElder
reviewed
Apr 26, 2019
| @@ -29,7 +29,7 @@ CLEAN_PATTERNS=( | |||
| ) | |||
|
|
|||
| for pattern in "${CLEAN_PATTERNS[@]}"; do | |||
| while IFS=$'\n' read -r -d match; do | |||
| while IFS=$'\n' read -r match; do | |||
| echo "Removing ${match#${KUBE_ROOT}\/} .." | |||
| rm -rf "${match#${KUBE_ROOT}\/}" | |||
| done < <(find "${KUBE_ROOT}" -iregex "^${KUBE_ROOT}/${pattern}$") | |||
There was a problem hiding this comment.
We should probably use -print0 and use this as the delimiter.
There was a problem hiding this comment.
@BenTheElder do you mean (1) eliminate IFS (2) append -print0 in "find" clause, and (3) use $'\0' as delimiter?
diff --git a/hack/make-rules/clean.sh b/hack/make-rules/clean.sh
index 9305c8df6c..9e85c3f879 100755
--- a/hack/make-rules/clean.sh
+++ b/hack/make-rules/clean.sh
@@ -29,10 +29,10 @@ CLEAN_PATTERNS=(
)
for pattern in "${CLEAN_PATTERNS[@]}"; do
- while IFS=$'\n' read -r match; do
+ while read -r -d $'\0' match; do
echo "Removing ${match#${KUBE_ROOT}\/} .."
rm -rf "${match#${KUBE_ROOT}\/}"
- done < <(find "${KUBE_ROOT}" -iregex "^${KUBE_ROOT}/${pattern}$")
+ done < <(find "${KUBE_ROOT}" -iregex "^${KUBE_ROOT}/${pattern}$" -print0)
done
# ex: ts=2 sw=2 et filetype=sh
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
/assign @BenTheElder
What this PR does / why we need it:
There is a regression introduced in #76840:
We shouldn't put "match" as a delimiter (followed by
-d). IMO a delimiter other than newline (default) is unnecessary in this case.With this PR, the bug can be fixed:
Special notes for your reviewer:
Does this PR introduce a user-facing change?: