diff options
| author |   Ryan Phillips <rphillips@gentoo.org> | 2003-01-31 22:13:10 +0000 |
|---|---|---|
| committer | Ryan Phillips <rphillips@gentoo.org> | 2003-01-31 22:13:10 +0000 |
| commit | 81e01ff11ce188f18774f6965b740697f845f3d7 (patch) | |
| tree | e74517e3508a0211a6e5e28137bfb8340294b3a6 /dev-db/phpmyadmin | |
| parent | fix bug #13453 - filter out -fomptimize-sibling-calls (diff) | |
| download | gentoo-2-81e01ff11ce188f18774f6965b740697f845f3d7.tar.gz gentoo-2-81e01ff11ce188f18774f6965b740697f845f3d7.tar.bz2 gentoo-2-81e01ff11ce188f18774f6965b740697f845f3d7.zip | |
if old config file exists then restore it on an upgrade
Diffstat (limited to 'dev-db/phpmyadmin')
| -rw-r--r-- | dev-db/phpmyadmin/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/phpmyadmin-2.3.3.ebuild | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index 50f489929f4d..645ced819559 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.10 2003/01/10 20:37:43 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.11 2003/01/31 22:13:10 rphillips Exp $ *phpmyadmin-2.3.3 (11 Dec 2002) + 31 Jan 2003; Ryan Phillips <rphillips@gentoo.org>: + restore old config file if it exists. fixes #12585 + 10 Jan 2003; Christian Birchinger <joker@gentoo.org> : Added "sparc" keyword. It has been running productive on sparc for weeks. diff --git a/dev-db/phpmyadmin/phpmyadmin-2.3.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.3.3.ebuild index 6ba6ccf65b5d..fbc0136e0e50 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.3.3.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.3.3.ebuild,v 1.3 2003/01/10 20:37:43 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.3.3.ebuild,v 1.4 2003/01/31 22:13:10 rphillips Exp $ MY_PN=phpMyAdmin @@ -25,6 +25,10 @@ src_install () { cd ${S} cp config.inc.php config.inc.php.orig + if [ -f /home/httpd/htdocs/phpmyadmin/config.inc.php ] ; then + cp /home/httpd/htdocs/phpmyadmin/config.inc.php ${WORKDIR} + fi + # We set these two variables so myphpadmin is able to run even if no one configured config.inc.php # - Quequero sed -e "s:PmaAbsoluteUri'] = '':PmaAbsoluteUri'] = 'http\://localhost/phpmyadmin/':" \ @@ -51,6 +55,10 @@ src_install () { dodoc ANNOUNCE.txt CREDITS ChangeLog TODO Documentation.{txt,html} \ INSTALL LICENSE RELEASE-DATE* + + if [ -f ${WORKDIR}/config.inc.php ] ; then + mv ${WORKDIR}/config.inc.php ${D}/home/httpd/htdocs/phpmyadmin + fi } pkg_postinst() { |