[Dbconfig-common-devel] dbconfig-common/dpkg config,1.19,1.20 postinst,1.13,1.14 prerm,1.10,1.11
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/dbconfig-common/dbconfig-common/dpkg
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv5598/dpkg
Modified Files:
config postinst prerm
Log Message:
some fixes
documentation update
Index: config
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- config 18 May 2005 19:49:38 -0000 1.19
+++ config 19 May 2005 01:48:33 -0000 1.20
@@ -54,19 +54,17 @@
iformat=`echo $dbc_load_include | cut -d: -f1`
ifile=`echo $dbc_load_include | cut -d: -f2-`
eval `dbconfig-load-include $dbc_load_include_args -f $iformat $ifile`
- for f in $dbc_register_templates; do
- db_fset $f seen true
+ for f in database-type $dbc_dbtype/method remote/host remote/newhost remote/port pgsql/authmethod-admin pgsql/authmethod-user $dbc_dbtype/admin-user db/app-user db/dbname; do
+ db_fset $dbc_package/$f seen true || true
done
+
db_set $dbc_package/database-type $dbc_dbtype
db_set $dbc_package/db/app-user "$dbc_dbuser"
- db_set $dbc_package/$dbc_dbtype/app-pass "$dbc_dbpass"
- db_set $dbc_package/$dbc_dbtype/app-password-confirm "$dbc_dbpass"
db_set $dbc_package/db/dbname "$dbc_dbname"
db_set $dbc_package/remote/host "$dbc_dbserver"
db_set $dbc_package/remote/port "$dbc_dbport"
- for f in $dbc_register_templates; do
- db_fset $f seen true
- done
+ db_set $dbc_package/$dbc_dbtype/app-pass "$dbc_dbpass"
+ db_set $dbc_package/password-confirm "$dbc_dbpass"
fi
fi
Index: postinst
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/postinst,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- postinst 18 May 2005 20:19:37 -0000 1.13
+++ postinst 19 May 2005 01:48:33 -0000 1.14
@@ -59,13 +59,13 @@
### now, create the app user account
###
$dbc_createuser_cmd || dbc_install_error "creating user"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
###
### create the database
###
$dbc_createdb_cmd || dbc_install_error "creating database"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
###
### populate the database
@@ -75,14 +75,14 @@
dbc_scriptfile=$dbc_share/scripts/$dbc_package/install/$dbc_dbtype
if [ -f "$dbc_sqlfile" ]; then
$dbc_sqlfile_cmd $dbc_sqlfile || dbc_install_error "populating database"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
fi
if [ -f "$dbc_scriptfile" ]; then
if ! sh -c "$dbc_scriptfile $*"; then
dbc_error="$dbc_scriptfile exited with non-zero status"
dbc_install_error "populating database"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
fi
fi
@@ -92,7 +92,7 @@
if dpkg --compare-versions "$dbc_first_version" gt "$dbc_oldversion"; then
if ! $dbc_checkuser_command; then
upgrade_error "importing dbconfig-settings"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
fi
fi
@@ -123,6 +123,7 @@
# ask if they want our help in the process at all
db_set $dbc_package/dbconfig-upgrade "$dbc_upgrade"
+ db_fset $dbc_package/dbconfig-upgrade seen false
db_input high $dbc_package/dbconfig-upgrade || true
db_go || true
db_get $dbc_package/dbconfig-upgrade
@@ -150,7 +151,7 @@
# execute the script
echo dbconfig-common: upgrading with $_dbc_f >&2
$dbc_sqlfile_cmd $_dbc_f || dbc_upgrade_error "processing $_dbc_f"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
done
# likewise for any scripts
@@ -161,7 +162,7 @@
if ! sh -c "$_dbc_f $*"; then
dbc_error="$_dbc_f exited with non-zero status"
dbc_upgrade_error "processing $_dbc_f"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
fi
done
fi
Index: prerm
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/prerm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- prerm 18 May 2005 20:19:37 -0000 1.10
+++ prerm 19 May 2005 01:48:33 -0000 1.11
@@ -17,6 +17,7 @@
if [ "$dbc_remove" ]; then
db_set $dbc_package/dbconfig-remove "$dbc_remove"
fi
+ db_fset $dbc_package/dbconfig-remove seen false
db_input high $dbc_package/dbconfig-remove || true
db_go || true
db_get $dbc_package/dbconfig-remove
@@ -83,7 +84,7 @@
$dbc_dump_cmd > $_dbc_dbfile
echo dbconfig-common: dropping $dbc_dbtype database $dbc_dbname >&2
$dbc_dropdb_cmd || dbc_remove_error "dropping database"
- [ "$dbc_tried_again" = "yes" ] && return 0
+ [ "$dbc_tried_again" ] && return 0
echo dbconfig-common: revoking privileges for user $dbc_dbuser on $dbc_dbname > /dev/stderr
$dbc_dropuser_cmd