com web/rmtools: touch the validation places: client/include/BuildVC.php client/include/PickleWeb.php
| From: | Anatol Belski | Date: | Wed, 02 Nov 2016 01:43:34 +0000 |
| Subject: | com web/rmtools: touch the validation places: client/include/BuildVC.php client/include/PickleWeb.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25933@lists.php.net to get a copy of this message | ||
Commit: 49d08e43dd42e274cb70b18b47fd7ff5de61ff5c
Author: Anatol Belski <ab@php.net> Wed, 2 Nov 2016 02:40:15 +0100
Parents: 37930384957a10aa16bdf5aad31d391cea92c09a
Branches: master pecl_legacy
Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=49d08e43dd42e274cb70b18b47fd7ff5de61ff5c
Log:
touch the validation places
Changed paths:
M client/include/BuildVC.php
M client/include/PickleWeb.php
Diff:
diff --git a/client/include/BuildVC.php b/client/include/BuildVC.php
index 119dad8..317110a 100644
--- a/client/include/BuildVC.php
+++ b/client/include/BuildVC.php
@@ -44,9 +44,11 @@ class BuildVC {
$path = getenv($vc_env_prefix . 'PATH');
if (empty($path)) {
- include __DIR__ . '/../data/config.php';
+ /* TODO check all the other things */
+ throw new \Exception("Compiler environment couldn't be determined");
+ //include __DIR__ . '/../data/config.php';
/* use default config */
- $env = $custom_env;
+ //$env = $custom_env;
} else {
$env = array();
$env['PATH'] = getenv($vc_env_prefix . 'PATH') . ';' .
getenv('PATH') ;
diff --git a/client/include/PickleWeb.php b/client/include/PickleWeb.php
index dec83a5..309de4f 100644
--- a/client/include/PickleWeb.php
+++ b/client/include/PickleWeb.php
@@ -162,9 +162,9 @@ class PickleWeb
} else if (empty($local) || !isset($local["packages"])) {
foreach ($remote["packages"] as $name => $tags) {
foreach ($tags as $version => $data) {
- if (preg_match(",master,", $version) || !$this->isValidTag($data)) {
+ /*if (!$this->isValidTag($data)) {
continue;
- }
+ }*/
/* $version is from the tag name, be strict and use the oone from the actual tag data*/
if ($this->isUniqueTag($name, $data["version"], $ret)) {
$ret[] = $data;
@@ -182,9 +182,9 @@ class PickleWeb
}
foreach ($tags as $version => $data) {
- if (preg_match(",master,", $version) || !$this->isValidTag($data)) {
+ /*if (!$this->isValidTag($data)) {
continue;
- }
+ }*/
if (!isset($local["packages"][$name][$version]) &&
$this->isUniqueTag($name, $data["version"], $ret)) {
$ret[] = $data;
}