From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 3 Jul 2009 10:38:54 +0000 (+0000)
Subject: Don't copy over subobjects in subreleases if their
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f9504d1742902ab54dec1078137742758c42fe2;p=gosa.git

Don't copy over subobjects in subreleases if their
parent is in "removed" state


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13881 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc b/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc
index 0278c5a17..d8a993859 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc
@@ -518,11 +518,6 @@ class FAI
           if(!empty($r)){
 
             foreach($r as $key ){
-              if(DEBUG_FAI_FUNC) { 
-                echo "<b>Copy current objects original attributes to next release</b> ".$key;
-                print_a($parent_attrs);
-              }
-             
               /* Only update the freeze tag if the entry actually exists. */
               $ldap->cat($key);
               if($ldap->count()){
@@ -531,7 +526,14 @@ class FAI
                 $rTag = FAI::get_release_tag(FAI::get_release_dn($key));
                 $parent_attrs['FAIstate'] = $rTag;
               }
-              FAI::save_FAI_object($key,$parent_attrs);
+              /* Don't copy over subobjects in subreleases if their parent is in "removed" state */
+              if(!FAI::parent_is_removed($key)){
+                if(DEBUG_FAI_FUNC) { 
+                  echo "<b>Copy current objects original attributes to next release</b> ".$key;
+                  print_a($parent_attrs);
+                }
+                FAI::save_FAI_object($key,$parent_attrs);
+              }
             }
           }