From 19a3a27d86c6f2b1cdb4f4ce1af355c5527b2959 Mon Sep 17 00:00:00 2001 From: RecursiveCptHook Date: Thu, 13 Aug 2020 17:02:28 -0700 Subject: [PATCH] Turn off scp to old linux share --- build_server/common/environ.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/build_server/common/environ.sh b/build_server/common/environ.sh index 6fa4a9b..b7b36d7 100644 --- a/build_server/common/environ.sh +++ b/build_server/common/environ.sh @@ -115,19 +115,24 @@ function vcp() { #use scp instead. this is a workaround for the problem of files #disappearing from the share folders. fedora samba is the current suspect. #if this fixes it we know that's where to look. - if [ "$(hostname)" != "lm-filer-01.leap.corp" -a -f "${_src}" -a "${_dst}" != "${_scp_dst}" -a "${LOCAL_BUILD}" != "true" ]; then - echo "${_src} --> ${_scp_dst}" - if scp -pB "${_src}" "${_scp_dst}"; then - return 0 - fi - else - if cp -v "${@}"; then - return 0 - fi - fi + # if [ "$(hostname)" != "lm-filer-01.leap.corp" -a -f "${_src}" -a "${_dst}" != "${_scp_dst}" -a "${LOCAL_BUILD}" != "true" ]; then + # echo "${_src} --> ${_scp_dst}" + # if scp -pB "${_src}" "${_scp_dst}"; then + # return 0 + # fi + # else + # if cp -v "${@}"; then + # return 0 + # fi + # fi + + if cp -v "${@}"; then + return 0 + fi + 1>&2 echo "Error: File copy failed - Exiting." - + exit 1 }