Gentoo Archives: gentoo-commits

From: "Ole Markus With (olemarkus)" <olemarkus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: pkg_postinst-v2.eblit
Date: Sun, 31 Oct 2010 09:26:39
Message-Id: 20101031092632.CC7CD20054@flycatcher.gentoo.org
1 olemarkus 10/10/31 09:26:32
2
3 Modified: pkg_postinst-v2.eblit
4 Log:
5 Fixed a QA issue related to nonexisting SAPIs
6
7 (Portage version: 2.1.9.11/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.5 dev-lang/php/files/eblits/pkg_postinst-v2.eblit
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?r1=1.4&r2=1.5
15
16 Index: pkg_postinst-v2.eblit
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- pkg_postinst-v2.eblit 30 Oct 2010 21:41:10 -0000 1.4
23 +++ pkg_postinst-v2.eblit 31 Oct 2010 09:26:32 -0000 1.5
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.4 2010/10/30 21:41:10 olemarkus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.5 2010/10/31 09:26:32 olemarkus Exp $
29
30 eblit-php-pkg_postinst() {
31 # Output some general info to the user
32 @@ -12,14 +12,16 @@
33
34
35 # Create the symlinks for php
36 - local m modules="cli apache2 fpm cgi"
37 - for m in $modules; do
38 + for m in ${SAPI}; do
39 + [[ ${m} == 'embed' ]] && continue;
40 if use $m ; then
41 local ci=$(eselect php show $m)
42 if [[ -z $ci ]]; then
43 eselect php set $m php${SLOT}
44 + einfo "Switched ${m} to use php:${SLOT}"
45 + einfo
46 elif [[ $ci != "php${SLOT}" ]] ; then
47 - elog "To switch $m to use php-${SLOT}, run"
48 + elog "To switch $m to use php:${SLOT}, run"
49 elog " eselect php set $m php${SLOT}"
50 elog
51 fi