com web/rmtools: pickle info needs PATH to the git when passing some git URL: client/include/PickleBuildVC.php client/include/PickleExt.php

Commit: eb0d46f986cddf0b424246cb45f75e2e19b167c0 Author: Anatol Belski <ab@php.net> Wed, 6 May 2015 16:34:37 +0200 Parents: 335c1267ae5aa35f073750c3f3033a813db531f2 Branches: master pecl_legacy Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=eb0d46f986cddf0b424246cb45f75e2e19b167c0 Log: pickle info needs PATH to the git when passing some git URL 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 088c039..5c840d9 100644 --- a/client/include/PickleBuildVC.php +++ b/client/include/PickleBuildVC.php @@ -92,9 +92,9 @@ class PickleBuildVC } $this->sdk_path = $branch->config->getBuildFromName($build_name)["sdk_path"]; - $env["PATH"] .= ";{$this->sdk_path}"; + $env["PATH"] = "{$this->sdk_path};" . $env["PATH"]; - $env["PATH"] .= ";c:\\apps\\git\\bin;c:\\apps\\bin"; + $env["PATH"] = "c:\\apps\\git\\bin;c:\\apps\\bin;" . $env["PATH"]; $this->env = $env; } @@ -169,5 +169,10 @@ class PickleBuildVC { return $this->int_dir; } + + public function getEnv() + { + return $this->env; + } } diff --git a/client/include/PickleExt.php b/client/include/PickleExt.php index 435f661..a63b61d 100644 --- a/client/include/PickleExt.php +++ b/client/include/PickleExt.php @@ -30,7 +30,7 @@ class PickleExt $cmd = "{$this->pickle_cmd} info {$this->pkg_uri}"; - $ret = exec_single_log($cmd, NULL, NULL); + $ret = exec_single_log($cmd, NULL, $this->build->getEnv()); if ($ret["return_value"]) { throw new \Exception($ret["log"]);