[Dbconfig-common-devel] dbconfig-common/dpkg postinst,1.10,1.11 prerm,1.8,1.9
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-serv22404/dpkg
Modified Files:
postinst prerm
Log Message:
a couple functions were missing dbc_ in front of them
Index: postinst
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/postinst,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- postinst 1 May 2005 00:17:12 -0000 1.10
+++ postinst 1 May 2005 17:20:32 -0000 1.11
@@ -139,7 +139,7 @@
for _dbc_f in $_dbc_upgrades_pending; do
# execute the script
echo dbconfig-common: upgrading with $_dbc_f >&2
- $dbc_sqlfile_cmd $_dbc_f || upgrade_error "processing $_dbc_f"
+ $dbc_sqlfile_cmd $_dbc_f || dbc_upgrade_error "processing $_dbc_f"
done
# likewise for any scripts
@@ -149,7 +149,7 @@
echo dbconfig-common: upgrading with $_dbc_f >&2
if ! sh -c "$_dbc_f $*"; then
dbc_error="$_dbc_f exited with non-zero status"
- upgrade_error "processing $_dbc_f"
+ dbc_upgrade_error "processing $_dbc_f"
fi
done
fi
Index: prerm
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dpkg/prerm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- prerm 1 May 2005 06:13:05 -0000 1.8
+++ prerm 1 May 2005 17:20:32 -0000 1.9
@@ -82,7 +82,7 @@
echo dbconfig-common: dumping $dbc_dbtype database $dbc_dbname to $_dbc_dbfile >&2
$dbc_dump_cmd > $_dbc_dbfile
echo dbconfig-common: dropping $dbc_dbtype database $dbc_dbname >&2
- $dbc_dropdb_cmd || remove_error "dropping database"
+ $dbc_dropdb_cmd || dbc_remove_error "dropping database"
echo dbconfig-common: revoking privileges for user $dbc_dbuser on $dbc_dbname > /dev/stderr
$dbc_dropuser_cmd