Bug#545118: update-exim4.conf should

[Ivan Shmakov]

Package: exim4-config
Version: 4.69-9

	The leftover DEBCONF strings check should consider the same set
	of files that the run_parts function does.  In particular,
	update-exim4.conf should ignore any *~ files in conf.d/, like:

--- update-exim4.conf	2008-10-01 01:27:02 +0700
+++ update-exim4.conf	2009-09-05 12:33:24 +0700
@@ -421,8 +421,10 @@
 # check for left-over DEBCONF strings that may cause installation trouble
 # (fix PEBCAK for people who don't accept conffile changes and don't
 # read docs)
-if grep -qr '^[^#]*DEBCONF[[:lower:]_]\+DEBCONF' $UPEX4C_confd $TEMPLATEFILE \
-   && ! grep -qr '^[[:space:]]*DEBCONFstringOK_config_adapted[[:space:]]*=' $UPEX4C_confd $TEMPLATEFILE; then
+if grep -qr '^[^#]*DEBCONF[[:lower:]_]\+DEBCONF' \
+       --exclude=\*~ $UPEX4C_confd $TEMPLATEFILE \
+   && ! grep -qr '^[[:space:]]*DEBCONFstringOK_config_adapted[[:space:]]*=' \
+       --exclude=\*~ $UPEX4C_confd $TEMPLATEFILE; then
   errormessage "DEBCONFsomethingDEBCONF found in exim configuration. This is most probably caused by you upgrading to exim4 4.67-3 or later without accepting the suggested conffile changes. Please read /usr/share/doc/exim4-config/NEWS.Debian.gz for 4.67-2 and 4.67-4"
 fi
 

	(Also note that given the Shell variable value substitution
	rules, the fragment above should read "$UPEX4C_confd"
	"$TEMPLATEFILE", not $UPEX4C_confd $TEMPLATEFILE, in order to
	behave consistently should any of these two variables ever be
	set to a value containing a whitespace.)

-- 
FSF associate member #7257