Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

1 files changed, 5 insertions, 6 deletions

diff --git a/tools/check-compare-generated.sh b/tools/check-compare-generated.sh
index 44b70f95..b66c5a10 100755
--- a/tools/check-compare-generated.sh
+++ b/tools/check-compare-generated.sh
@@ -2,17 +2,16 @@
 
 set -e
 
-srcdir="$1"
-builddir="$2"
-doc_h="$3"
+f_commited="$1"
+f_generated="$2"
 
 [ -n "$NMTST_NO_CHECK_SETTINGS_DOCS" ] && exit 0
 
-cmp -s "${srcdir}/${doc_h}.in" "${builddir}/${doc_h}" && exit 0
+cmp -s "$f_commited" "$f_generated" && exit 0
 
 if [ "$NM_TEST_REGENERATE" = 1 ] ; then
-   cp -f "${builddir}/${doc_h}" "${srcdir}/${doc_h}.in"
+   cp -f "$f_generated" "$f_commited"
 else
-   echo "*** Error: the generated file '${builddir}/${doc_h}' differs from the source file '${srcdir}/${doc_h}.in'. You probably should copy the generated file over to the source file. You can skip this test by setting NMTST_NO_CHECK_SETTINGS_DOCS=yes. You can also automatically copy the file by rerunning the test with NM_TEST_REGENERATE=1"
+   echo "*** Error: the generated file '$f_generated' differs from the source file '$f_commited'. You probably should copy the generated file over to the source file. You can skip this test by setting NMTST_NO_CHECK_SETTINGS_DOCS=yes. You can also automatically copy the file by rerunning the test with NM_TEST_REGENERATE=1"
    exit 1
 fi