Skip to content
Snippets Groups Projects
Commit 68cef2c7 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'task-1797-revision-wrongly-caches' into 'master'

Task 1797 revision wrongly caches

See merge request !76
parents 7da45f92 e60015e7
No related branches found
No related tags found
No related merge requests found
......@@ -160,6 +160,7 @@ if (!isset($aConfig) || !is_array($aConfig)) {
'buildDefaultsDir',
'packageDir',
'archiveDir',
'tmpDir',
) as $sKey) {
checkdir($aConfig[$sKey], $sKey);
}
......
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment