From bd492098c78a940a7c47f1c8a5eb7e238d9f52e5 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Jun 23 2022 12:02:07 +0000 Subject: scripts/tar-up.sh: Detect untracked changes to rpm directory. --- diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh index 38715a0..5c4c801 100755 --- a/scripts/tar-up.sh +++ b/scripts/tar-up.sh @@ -166,12 +166,6 @@ check_for_merge_conflicts $referenced_files kernel-source.changes{,.old} || \ inconsistent=true scripts/check-conf || inconsistent=true scripts/check-cvs-add --committed || inconsistent=true -# FIXME: someone should clean up the mess and make this check fatal -if $inconsistent; then - echo "Inconsistencies found." - echo "Please clean up series.conf and/or the patches directories!" - echo -fi tsfile=source-timestamp if ! scripts/cvs-wd-timestamp > $build_dir/$tsfile; then @@ -195,6 +189,15 @@ trap 'if test -n "$CLEANFILES"; then rm -rf "${CLEANFILES[@]}"; fi' EXIT tmpdir=$(mktemp -dt ${0##*/}.XXXXXX) CLEANFILES=("${CLEANFILES[@]}" "$tmpdir") rpmfiles=$(ls rpm/* | grep -v "~$") +rpmstatus=$(for i in $rpmfiles ; do git status -s $i ; done) +[ -z "$rpmstatus" ] || { inconsistent=true ; echo "$rpmstatus" ; } + +# FIXME: someone should clean up the mess and make this check fatal +if $inconsistent; then + echo "Inconsistencies found." + echo "Please clean up series.conf and/or the patches directories!" + echo +fi cp -p $rpmfiles config.conf supported.conf doc/* $build_dir match="${flavor:+\\/$flavor$}"