Skip to content
Snippets Groups Projects
Commit 571b10ec authored by hahn's avatar hahn
Browse files

skip check of package file in phase

parent 4c61d514
No related branches found
No related tags found
1 merge request!195534 add docker
This commit is part of merge request !19. Comments created here will be created in the context of that merge request.
......@@ -411,8 +411,9 @@ class project extends base {
mkdir($this->_aConfig['packageDir'] . "/" . $sPhase);
}
if ($sPlace == "onhold")
if ($sPlace == "onhold"){
$sBase.="_onhold";
}
// $sBase .= "/" . $this->_aPrjConfig["fileprefix"];
// url for deployed
if ($sPlace == "deployed") {
......@@ -424,6 +425,7 @@ class project extends base {
}
}
// echo "DEBUG: ".__METHOD__."($sPhase, $sPlace) --> $sBase<br>";
return $sBase;
}
......@@ -976,20 +978,20 @@ class project extends base {
$sJsonfile = $this->_getInfofile($sPhase, $sKey);
$aTmp[$sKey] = array();
if (file_exists($sJsonfile)) {
$sPkgfile = $this->_getPackagefile($sPhase, $sKey);
if (file_exists($sPkgfile)) {
// $sPkgfile = $this->_getPackagefile($sPhase, $sKey);
// if (file_exists($sPkgfile)) {
$aJson = json_decode(file_get_contents($sJsonfile), true);
if (is_array($aJson) && array_key_exists("version", $aJson)) {
$aTmp[$sKey] = $aJson;
$aTmp[$sKey]["infofile"] = $sJsonfile;
$aTmp[$sKey]["packagefile"] = $sPkgfile;
// $aTmp[$sKey]["packagefile"] = $sPkgfile;
$aTmp[$sKey]["ok"] = 1;
} else {
$aTmp[$sKey]["error"] = sprintf(t("class-project-error-metafile-has-no-version"), $sJsonfile, print_r($aJson, true));
}
} else {
$aTmp[$sKey]["error"] = sprintf(t("class-project-error-getPhaseInfos-package-not-found"), $sPkgfile);
}
// } else {
// $aTmp[$sKey]["error"] = sprintf(t("class-project-error-getPhaseInfos-package-not-found"), $sPkgfile);
// }
} else {
$aTmp[$sKey]["error"] = sprintf(t("class-project-error-metafile-does-not-exist"), $sJsonfile);
}
......@@ -1043,6 +1045,7 @@ class project extends base {
$this->_aData["phases"][$sPhase] = $aTmp;
}
// echo '<pre>'.print_r($this->_aData["phases"][$sPhase], 1).'</pre>'.__METHOD__.'<br>';
return $this->_aData["phases"][$sPhase];
}
......@@ -1521,7 +1524,7 @@ class project extends base {
$this->oRolloutPlugin = new $sPluginClassname(array(
'lang'=>$this->_aConfig['lang'],
'phase'=>false,
'globalcfg'=>$this->_aConfig['plugins']['rollout'][$sPluginName],
'globalcfg'=>isset($this->_aConfig['plugins']['rollout'][$sPluginName]) ? $this->_aConfig['plugins']['rollout'][$sPluginName] : [],
'projectcfg'=>$this->_aPrjConfig,
));
// print_r($this->_oRolloutPlugin->getPluginfos());
......@@ -3130,7 +3133,8 @@ class project extends base {
$bIsError = false;
$this->_oHtml = new htmlguielements();
$sInfos.='';
$sInfos='';
$sTitle='';
if (array_key_exists("title", $aOptions) && $aOptions["title"]) {
$sTitle.=$aOptions["title"];
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment