| 1 |
commit: 5bd41632a6596ad6a8974eee4caa38b9dc2b7dc5 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 27 23:32:34 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 27 23:32:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd41632 |
| 7 |
|
| 8 |
php-pear-r2.eclass: Fix inverted test and bad variable reference |
| 9 |
|
| 10 |
The channel test inadvertantly tested for success rather than failure |
| 11 |
Now the command is always run and the return value is checked. |
| 12 |
A reference to PEAR_PN was left over when it should be PEAR_P |
| 13 |
|
| 14 |
eclass/php-pear-r2.eclass | 5 +++-- |
| 15 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass |
| 18 |
index 48ff30355f9..dad075686bf 100644 |
| 19 |
--- a/eclass/php-pear-r2.eclass |
| 20 |
+++ b/eclass/php-pear-r2.eclass |
| 21 |
@@ -97,9 +97,10 @@ php-pear-r2_src_install() { |
| 22 |
php-pear-r2_pkg_postinst() { |
| 23 |
# Add unknown channels |
| 24 |
if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then |
| 25 |
- if "${EROOT}usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null; then |
| 26 |
+ "${EROOT}usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null |
| 27 |
+ if [[ $? -ne 0 ]]; then |
| 28 |
"${EROOT}usr/bin/peardev" channel-add \ |
| 29 |
- "${EROOT}usr/share/php/.packagexml/${PEAR_PN}-channel.xml" \ |
| 30 |
+ "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" \ |
| 31 |
|| einfo "Ignore any errors about existing channels" |
| 32 |
fi |
| 33 |
fi |
Archives