com php-src: Fixed bug #70917 install-pear-nozlib.phar missing: makedist
| From: | Anatol Belski | Date: | Tue, 17 Nov 2015 12:19:59 +0000 |
| Subject: | com php-src: Fixed bug #70917 install-pear-nozlib.phar missing: makedist | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89916@lists.php.net to get a copy of this message | ||
Commit: 27742dc6e8dabf36bee2bbdbc9e2a9be3065db22
Author: Anatol Belski <ab@php.net> Sun, 15 Nov 2015 18:57:10 +0100
Parents: 03b0733a4992fda7d93e49cd2d04f147150cc4db
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=27742dc6e8dabf36bee2bbdbc9e2a9be3065db22
Log:
Fixed bug #70917 install-pear-nozlib.phar missing
The actual bug is caused by some network error while packaged.. An
error check added to interrupt the packaging process if phar package
download failed.
Bugs:
https://bugs.php.net/70917
Changed paths:
M makedist
Diff:
diff --git a/makedist b/makedist
index 5b28dd8..48c6312 100755
--- a/makedist
+++ b/makedist
@@ -119,6 +119,11 @@ sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef
YYTOKENTYPE,g' $MY_OLD
$ECHO_N "makedist: Attempting to download PEAR's phar archive"
if test ! -x wget; then
wget https://pear.php.net/install-pear-nozlib.phar
-nd -P pear/
+ if [ "x$?" != "x0" ]
+ then
+ $ECHO_N "Pear download failed";
+ exit 7
+ fi
else
$ECHO_N "Missing wget binary needed for pear download";
exit 7