[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-16-gabb7e94

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit b926b89caa0df274c12b117e5b8728e56aa2b94f
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Mar 26 22:29:54 2009 -0400

    I think we can safely get rid of a version check for ucf that hasn't
    been necessary since woody.
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index 1b39d49..9c500cc 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -28,8 +28,6 @@ set -e
 
 #COMMON-FUNCTIONS#
 
-UCFVER=`check_ucf`
-
 case "$1" in
   configure)
   
diff --git a/debian/clamav-daemon.postinst.in b/debian/clamav-daemon.postinst.in
index 070180d..a75d2c6 100644
--- a/debian/clamav-daemon.postinst.in
+++ b/debian/clamav-daemon.postinst.in
@@ -28,8 +28,6 @@ set -e
 case "$1" in
   configure)
 
-  UCFVER=`check_ucf`
-
   CLAMAVCONF=/etc/clamav/clamd.conf
   DEBROTATEFILE=/var/lib/clamav/clamdrotate.debconf
   CLAMAVROTATEFILE=/etc/logrotate.d/clamav-daemon
diff --git a/debian/clamav-freshclam.postinst.in b/debian/clamav-freshclam.postinst.in
index 489160d..15a3919 100644
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@ -34,8 +34,6 @@ DEBROTFILE=/var/lib/clamav/clamav-freshclam
 
 #COMMON-FUNCTIONS#
 
-UCFVER=`check_ucf`
-
 case "$1" in
   configure)
 
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 3a119b4..06b54bf 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -31,8 +31,6 @@ set -e
 case "$1" in
   configure)
 
-  UCFVER=`check_ucf`
-
   CLAMAVMILTERCONF=/etc/clamav/clamav-milter.conf
   DEBROTATEFILE=/var/lib/clamav/clamav-milter.rotate.debconf
   CLAMAVROTATEFILE=/etc/logrotate.d/clamav-milter
diff --git a/debian/common_functions b/debian/common_functions
index 3fcbcfc..153a2c7 100644
--- a/debian/common_functions
+++ b/debian/common_functions
@@ -1,12 +1,3 @@
-check_ucf()
-{
-if ucf -h 2>&1 | grep -q debconf-ok; then
-  echo ok
-else
-  echo notok
-fi
-}
-
 to_lower()
 {
   word="$1"
@@ -55,11 +46,7 @@ ucf_upgrade_check()
 
   if [ -f "$configfile" ]; then
     add_to_ucf $configfile $ucffile
-    if [ "$UCFVER" = 'ok' ]; then
-      ucf --three-way --debconf-ok "$sourcefile" "$configfile"
-    else
-      ucf --three-way "$sourcefile" "$configfile" < /dev/tty
-    fi
+    ucf --three-way --debconf-ok "$sourcefile" "$configfile"
   else
     [ -d /var/lib/ucf/cache ] || mkdir -p /var/lib/ucf/cache
     cp $sourcefile $configfile

-- 
Debian repository for ClamAV