changeset 325:c36eb2596531 noffle

[svn] fixed inclusion of db_*
author godisch
date Sun, 23 Feb 2003 15:16:46 +0000
parents 5ec39beae9c5
children f478d73876e7
files debian/postinst debian/postrm debian/prerm
diffstat 3 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/debian/postinst	Sat Feb 22 21:54:34 2003 +0000
+++ b/debian/postinst	Sun Feb 23 15:16:46 2003 +0000
@@ -1,10 +1,13 @@
 #!/bin/sh
-# $Id: postinst 459 2003-02-22 21:54:34Z godisch $
+# $Id: postinst 460 2003-02-23 15:16:46Z godisch $
 
 set -e
 
 [ "$1" = configure ] || exit 0
 
+. /usr/share/debconf/confmodule
+db_version 2.0
+
 server_config=/etc/news/noffle.conf
 debian_config=/etc/default/noffle
 
@@ -32,9 +35,6 @@
 	mv -f /etc/noffle.conf.old $server_config.old 2> /dev/null || :
 fi
 
-. /usr/share/debconf/confmodule
-db_version 2.0
-
 db_get noffle/debconf || RET=""
 if [ "$RET" != false ]; then
 	db_get noffle/port || RET=""
@@ -87,7 +87,6 @@
 	mv -f $server_config.new $server_config
 	mv -f $debian_config.new $debian_config
 fi
-db_stop
 
 # sanity checks
 chown -R news:news /var/lock/noffle /var/spool/noffle
@@ -111,4 +110,5 @@
 	sleep 2
 fi
 
+db_stop
 exit 0
--- a/debian/postrm	Sat Feb 22 21:54:34 2003 +0000
+++ b/debian/postrm	Sun Feb 23 15:16:46 2003 +0000
@@ -1,7 +1,9 @@
 #!/bin/sh
-# $Id: postrm 459 2003-02-22 21:54:34Z godisch $
+# $Id: postrm 460 2003-02-23 15:16:46Z godisch $
 
 set -e
+. /usr/share/debconf/confmodule
+db_version 2.0
 
 server_config=/etc/news/noffle.conf
 debian_config=/etc/default/noffle
@@ -18,11 +20,8 @@
 		$server_config $server_config.old \
 		$debian_config $debian_config.old
 	rm -rf /etc/noffle /var/spool/noffle
-	if [ -e /usr/share/debconf/confmodule ]; then
-		. /usr/share/debconf/confmodule
-		db_purge
-		db_stop
-	fi
+	db_purge
 fi
 
+db_stop
 exit 0
--- a/debian/prerm	Sat Feb 22 21:54:34 2003 +0000
+++ b/debian/prerm	Sun Feb 23 15:16:46 2003 +0000
@@ -1,7 +1,9 @@
 #!/bin/sh
-# $Id: prerm 459 2003-02-22 21:54:34Z godisch $
+# $Id: prerm 460 2003-02-23 15:16:46Z godisch $
 
 set -e
+. /usr/share/debconf/confmodule
+db_version 2.0
 
 if [ -x /usr/sbin/invoke-rc.d ]; then
 	invoke-rc.d noffle stop
@@ -10,13 +12,11 @@
 fi
 
 if [ -e /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
-	db_version 2.0
 	db_get noffle/port || RET=""
 	port="$RET"
 	[ -z "$port" -o "$port" = 119 ] && port=nntp
 	update-inetd --disable $port
-	db_stop
 fi
 
+db_stop
 exit 0