github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34946 from jellonek/macos_compatible_copying

Browse Source 
Automatic merge from submit-queue

utils: Use macOS copatible copying method

Same as in #34944, releated to #34890

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2016-10-18 11:07:01 -07:00
committed by GitHub
parent b77e13444f b45dfd5e8f
commit a5da5c0952
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/verify-generated-protobuf.sh
View File

@@ -35,7 +35,7 @@ trap "cleanup" EXIT SIGINT
cleanup
for APIROOT in ${APIROOTS}; do
mkdir -p "${_tmp}/${APIROOT}"
cp -a -T "${KUBE_ROOT}/${APIROOT}" "${_tmp}/${APIROOT}"
cp -a "${KUBE_ROOT}/${APIROOT}"/* "${_tmp}/${APIROOT}/"
done
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-protobuf.sh"
@@ -44,7 +44,7 @@ for APIROOT in ${APIROOTS}; do
echo "diffing ${APIROOT} against freshly generated protobuf"
ret=0
diff -Naupr -I 'Auto generated by' -x 'zz_generated.*' "${KUBE_ROOT}/${APIROOT}" "${TMP_APIROOT}" || ret=$?
cp -a -T "${TMP_APIROOT}" "${KUBE_ROOT}/${APIROOT}"
cp -a "${TMP_APIROOT}"/* "${KUBE_ROOT}/${APIROOT}/"
if [[ $ret -eq 0 ]]; then
echo "${APIROOT} up to date."
else