r103835 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103834‎ | r103835 | r103836 >
Date:21:17, 21 November 2011
Author:hashar
Status:deferred
Tags:
Comment:
some cleanup on rm. dbconfig uses a PHP file

dbconfig still does not generate anything for me :( Hence this package
does not configure the database yet :-(
Modified paths:
  • /trunk/debs/testswarm/debian/rules (modified) (history)
  • /trunk/debs/testswarm/debian/testswarm.config (modified) (history)
  • /trunk/debs/testswarm/debian/testswarm.debhelper.log (modified) (history)
  • /trunk/debs/testswarm/debian/testswarm.postinst (modified) (history)
  • /trunk/debs/testswarm/debian/testswarm.postrm.debhelper (added) (history)
  • /trunk/debs/testswarm/debian/testswarm.substvars (modified) (history)

Diff [purge]

Index: trunk/debs/testswarm/debian/testswarm.substvars
@@ -1 +1 @@
2 -misc:Depends=
 2+misc:Depends=debconf (>= 0.5) | debconf-2.0
Index: trunk/debs/testswarm/debian/rules
@@ -21,14 +21,12 @@
2222 #$(MAKE)
2323 touch $@
2424
25 -clean:
 25+clean: unpatch
2626 dh_testdir
2727 dh_testroot
28 - rm -f build-stamp
29 - #$(MAKE) clean
 28+ rm -f build-stamp configure-stamp
 29+ dh_clean
3030
31 - dh_clean
32 -
3331 install: build
3432 dh_testdir
3533 dh_testroot
@@ -55,6 +53,7 @@
5654 dh_installchangelogs
5755 dh_installdocs
5856 dh_installman
 57+ dh_installdebconf
5958 dh_link
6059 dh_strip
6160 dh_compress
@@ -66,4 +65,4 @@
6766 dh_builddeb
6867
6968 binary: binary-indep binary-arch
70 -.PHONY: build clean binary-indep binary-arch binary install
 69+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
Index: trunk/debs/testswarm/debian/testswarm.config
@@ -5,9 +5,13 @@
66 . /usr/share/debconf/confmodule
77 if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
88 . /usr/share/dbconfig-common/dpkg/config.mysql
 9+ dbc_first_version="0.0.20111012-1"
 10+ dbc_load_include="php:/etc/testswarm/debian.php"
911 dbc_go testswarm $@
1012 fi
1113
1214 db_go || true
1315
 16+#DEBHELPER#
 17+
1418 exit 0
Index: trunk/debs/testswarm/debian/testswarm.debhelper.log
@@ -2,6 +2,7 @@
33 dh_installchangelogs
44 dh_installdocs
55 dh_installman
 6+dh_installdebconf
67 dh_link
78 dh_strip
89 dh_compress
Index: trunk/debs/testswarm/debian/testswarm.postrm.debhelper
@@ -0,0 +1,6 @@
 2+# Automatically added by dh_installdebconf
 3+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
 4+ . /usr/share/debconf/confmodule
 5+ db_purge
 6+fi
 7+# End automatically added section
Index: trunk/debs/testswarm/debian/testswarm.postinst
@@ -5,14 +5,16 @@
66
77 set -e
88
 9+#export DEBCONF_DEBUG=developer
 10+
911 . /usr/share/debconf/confmodule
1012 . /usr/share/dbconfig-common/dpkg/config.mysql
1113 dbc_first_version="0.0.20111012-1"
12 -dbc_generate_include="template:/usr/share/testswarm/site/config.ini"
 14+#dbc_generate_include="template:/usr/share/testswarm/site/config.ini"
 15+#dbc_generate_include_args="-otemplate_infile=/etc/testswarm/config.Debian.ini"
 16+dbc_generate_include="php:/etc/testswarm/debian.php"
1317 dbc_generate_include_owner="root:www-data"
1418 dbc_generate_include_perms="0640"
15 -dbc_generate_include_args="-o template_infile=/etc/testswarm/config.Debian.ini --dbname=database_default --dbpass=database_password --dbuser=database_username --dbserver=database_hostname --dbport=database_port"
16 -dbc_generate_include_args="-o template_infile=/etc/testswarm/config.Debian.ini"
1719 dbc_go testswarm $@
1820
1921 # config/testswarm.sql

Follow-up revisions

RevisionCommit summaryAuthorDate
r103887dbconfig scripts are per stage!!!...hashar09:15, 22 November 2011

Status & tagging log