From e2bcb4c6c84727817d5c43235a510dbd0c80df61 Mon Sep 17 00:00:00 2001 From: albailey Date: Thu, 27 Aug 2020 11:01:45 -0500 Subject: [PATCH] Eliminate intermediate .tox files during build The symlinks under .tox were being included for md5sum calculations. The md5sum calculations would report an error when a file containing a space was encountered (which can happen in some .tox libraries such as setuptools Change-Id: Ib9bfe55a66e1f27b1e39596b14303c0ef00852c6 Signed-off-by: albailey --- build-tools/build-srpms-common.sh | 2 +- build-tools/srpm-utils | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/build-srpms-common.sh b/build-tools/build-srpms-common.sh index a919cea2..02756b36 100644 --- a/build-tools/build-srpms-common.sh +++ b/build-tools/build-srpms-common.sh @@ -94,7 +94,7 @@ md5sums_from_input_vars () { fi # Remove $MY_REPO prefix from paths - cat $INPUT_FILES_SORTED | xargs md5sum | sed "s# $(readlink -f $MY_REPO)/# #" + cat $INPUT_FILES_SORTED | xargs -d '\n' md5sum | sed "s# $(readlink -f $MY_REPO)/# #" if [ $TMP_FLAG -eq 0 ]; then \rm -f $INPUT_FILES_SORTED diff --git a/build-tools/srpm-utils b/build-tools/srpm-utils index 8160856b..14f8277d 100644 --- a/build-tools/srpm-utils +++ b/build-tools/srpm-utils @@ -3411,8 +3411,8 @@ srpm_source_file_list () { # Create lists of input files (INPUT_FILES) and symlinks (INPUT_LINKS). # First elements are absolute paths... while read path; do - find "${path}" -type f | grep -v -e '[/][.]git$' -e '[/][.]git[/]' >> $INPUT_FILES - find "${path}" -type l | grep -v -e '[/][.]git$' -e '[/][.]git[/]' >> $INPUT_LINKS + find "${path}" -type f | grep -v -e '[/][.]git$' -e '[/][.]git[/]' -e '[/][.]tox[/]' >> $INPUT_FILES + find "${path}" -type l | grep -v -e '[/][.]git$' -e '[/][.]git[/]' -e '[/][.]tox[/]' >> $INPUT_LINKS done < "${INPUT_SOURCES}" # Create sorted, unique list of canonical paths