com web/rmtools: catch one more fail in PickleExt, add more paths: client/include/PickleBuildVC.php client/include/PickleExt.php

Commit: 335c1267ae5aa35f073750c3f3033a813db531f2 Author: Anatol Belski <ab@php.net> Wed, 6 May 2015 16:02:22 +0200 Parents: 32d75bb814cf4a937817f5d1a8b7470305331b54 Branches: master pecl_legacy Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=335c1267ae5aa35f073750c3f3033a813db531f2 Log: catch one more fail in PickleExt, add more paths Changed paths: M client/include/PickleBuildVC..php M client/include/PickleExt.php Diff: diff --git a/client/include/PickleBuildVC.php b/client/include/PickleBuildVC.php index 7c79515..088c039 100644 --- a/client/include/PickleBuildVC.php +++ b/client/include/PickleBuildVC.php @@ -94,6 +94,8 @@ class PickleBuildVC $this->sdk_path = $branch->config->getBuildFromName($build_name)["sdk_path"]; $env["PATH"] .= ";{$this->sdk_path}"; + $env["PATH"] .= ";c:\\apps\\git\\bin;c:\\apps\\bin"; + $this->env = $env; } diff --git a/client/include/PickleExt.php b/client/include/PickleExt.php index d324b82..435f661 100644 --- a/client/include/PickleExt.php +++ b/client/include/PickleExt.php @@ -32,13 +32,17 @@ class PickleExt $cmd = "{$this->pickle_cmd} info {$this->pkg_uri}"; $ret = exec_single_log($cmd, NULL, NULL); + if ($ret["return_value"]) { + throw new \Exception($ret["log"]); + } + if (!preg_match(",Package name\s+\|\s+([^\s]+)\s+\|,", $ret["log"], $m)) { throw new \Exception("Couldn't parse extension name"); } $this->name = $m[1]; if (!preg_match(",Package version.+\|\s+([a-z0-9\.\-]+)\s+\|,i", $ret["log"], $m)) { - throw new \Exception("Couldn't parse extension versiot"); + throw new \Exception("Couldn't parse extension version"); } $this->version = $m[1]; }