From 6396c4ec4f1aded688c4d8d681a287799294f680 Mon Sep 17 00:00:00 2001
From: hahn <hahn@AAE49.campus.unibe.ch>
Date: Fri, 14 Mar 2014 08:45:25 +0100
Subject: [PATCH] - FIX: include config for cronjob cron_deployment - FIX:
 progress message in method Deploy

---
 public_html/deployment/classes/project.class.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index d2fa2682..8329e210 100644
--- a/public_html/deployment/classes/project.class.php
+++ b/public_html/deployment/classes/project.class.php
@@ -1335,6 +1335,9 @@ class project {
         $sQueueLink = $this->_getFileBase($sPhase, "onhold");
         $sRepoLink = $this->_getFileBase($sPhase, "ready2install");
 
+        // --------------------------------------------------
+        // checks
+        // --------------------------------------------------
         $sReturn.="<h3>" . t("class-project-deploy-label-checks") . "</h3>";
         if (array_key_exists("deploytimes", $this->_aConfig["phases"][$sPhase])) {
             // check if the a deploy time is reached
@@ -1392,8 +1395,14 @@ class project {
             $this->_TempDelete();
             return $this->getBox("error", t("class-project-error-command-failed") . $sReturn);
         }
-        $this->_TempFill($sReturn);
 
+        $aActionList['iActive'] ++;
+        $this->_TempFill($sReturn, $aActionList);
+
+        
+        // --------------------------------------------------
+        // synch packages
+        // --------------------------------------------------
         // $sReturn.=$this->_execAndSend("ln -s $sLinkTarget $sLinkName");
         if (array_key_exists('mirrorPackages', $this->_aConfig) && count($this->_aConfig['mirrorPackages'])) {
             foreach ($this->_aConfig['mirrorPackages'] as $sLabel => $aTarget) {
@@ -1427,6 +1436,11 @@ class project {
         $aActionList['iActive'] ++;
         $this->_TempFill($sReturn, $aActionList);
 
+        
+        // --------------------------------------------------
+        // move the queue link to the repo name
+        // --------------------------------------------------
+        
         // TODO: run puppet agent on target server(s) - for preview only
         if (array_key_exists("puppethost", $this->_aPrjConfig["phases"][$sPhase]) && $this->_aPrjConfig["phases"][$sPhase]["puppethost"]
         ) {
-- 
GitLab