diff --git a/public_html/check-config.php b/public_html/check-config.php index f73d7ec99c2924cfec24c0c1c5ba68bf005d6d52..ee675a30a8447e936d93782a692152a61566129d 100644 --- a/public_html/check-config.php +++ b/public_html/check-config.php @@ -160,6 +160,7 @@ if (!isset($aConfig) || !is_array($aConfig)) { 'buildDefaultsDir', 'packageDir', 'archiveDir', + 'tmpDir', ) as $sKey) { checkdir($aConfig[$sKey], $sKey); } diff --git a/public_html/deployment/classes/vcs.git.class.php b/public_html/deployment/classes/vcs.git.class.php index 0a4fad7820fbb5c85078c4d712a250f1449b0562..a06fa59de6ed562814bc688101778309eef7f8d9 100644 --- a/public_html/deployment/classes/vcs.git.class.php +++ b/public_html/deployment/classes/vcs.git.class.php @@ -228,7 +228,7 @@ class vcs implements iVcs { $sGitCmd.='git ls-remote --heads --tags origin 2>&1 ;'; $this->log(__FUNCTION__." start command $sGitCmd"); exec($sGitCmd, $aOutput, $iRc); - $this->log(__FUNCTION__." end command $sGitCmd"); + $this->log(__FUNCTION__." end with rc=$iRc ", ($iRc==0 ? 'info':'error')); if ($iRc == 0) { // use cache that getCommitmessageByBranch can access it @@ -360,6 +360,8 @@ class vcs implements iVcs { public function getRevision($sWorkDir = false) { $this->log(__FUNCTION__." start"); $aReturn = array(); + $aOutput=array(); + $iRc=false; if (!$this->getUrl()) { return false; } @@ -385,8 +387,11 @@ class vcs implements iVcs { $sGitCmd.='git log -1 "' . $this->_sCurrentBranch . '" 2>&1 ; '; // 0.0 s $this->log(__FUNCTION__." start command $sGitCmd"); - $sLoginfo = shell_exec($sGitCmd); - $this->log(__FUNCTION__." end command $sGitCmd"); + // $sLoginfo = shell_exec($sGitCmd); + exec($sGitCmd, $aOutput, $iRc); + $sLoginfo= implode("\n", $aOutput); + $this->log(__FUNCTION__." end with rc=$iRc <pre>$sLoginfo</pre>", ($iRc==0 ? 'info':'error')); + /* * * example output: