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

- overview - filter link moved to top right

- revision fixed to top right
- fixed warning "headers already sent" 
- new: setup: show errors on top
- new try: read remote git log
parent e4b391b5
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ if (array_key_exists("confirm", $aParams)) {
</p>';
$sRevison=false;
$aRepodata = $oPrj->getRepoRevision();
if (is_array($aRepodata) && array_key_exists("revision", $aRepodata)) {
if (array_key_exists("revision", $aRepodata)) {
$sRevison = $aRepodata["revision"];
if (
array_key_exists("revision", $aPhaseData2["onhold"]) && $aPhaseData2["onhold"]["revision"] == $sRevison
......
......@@ -669,7 +669,7 @@ class project {
$sGitCmd.="export testdir=/tmp/test_\$\$ ; ";
// $sGitCmd.="set -vx ; ";
$sGitCmd.="mkdir \$testdir && cd \$testdir && ";
$sGitCmd.="git init && ";
$sGitCmd.="git init >/dev/null && ";
$sGitCmd.="git remote add origin " . $this->_aPrjConfig["build"]["ssh"] . " && ";
$sGitCmd.="git fetch 2>&1 && ";
$sGitCmd.="git log -1 origin/master ; ";
......@@ -686,13 +686,17 @@ class project {
"revision" => $sRevision,
"message" => $sReturn
);
return $this->_aData["phases"]["source"];
} else {
$this->_aData["phases"]["source"] = array(
"error" => $sReturn
);
}
break;
default:
die("getRepoRevision(): Build Type not supported: " . $this->_aPrjConfig["build"]["type"] . $sReturn);
}
return $sReturn;
return $this->_aData["phases"]["source"];
}
// ----------------------------------------------------------------------
......@@ -1601,7 +1605,7 @@ class project {
$sKeyfile = dirname(dirname(__file__)) . "/" . $this->_aPrjConfig["build"]["keyfile"];
$sWrapper = dirname(dirname(dirname(dirname(__file__)))) . "/shellscripts/gitsshwrapper.sh";
$aRepodata = $this->getRepoRevision();
if (is_array($aRepodata) && array_key_exists("revision", $aRepodata)) {
if (array_key_exists("revision", $aRepodata)) {
$sRevision = $aRepodata["revision"];
$sReturn.=$this->_getChecksumDiv($sRevision);
$sReturn.= '<i class="icon-tag"></i> Revision: ' . $sRevision;
......@@ -1712,7 +1716,7 @@ class project {
if (is_array($aRepodata) && array_key_exists("message", $aRepodata)) {
$sRepoCheck='<span class="ok">OK, Zugriff auf das Repo erfolgreich</span>';
} else {
$sRepoCheck='<span class="error">FEHLER: Auf das Repo kann nicht zugegriffen werden. ('.$aRepodata.')</span>';
$sRepoCheck='<span class="error">FEHLER: Auf das Repo kann nicht zugegriffen werden. ('.$aRepodata["error"].')</span>';
$sMessages.=$this->getBox("error", "Auf das Repo kann nicht zugegriffen werden.");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment