From: cajus Date: Wed, 9 Apr 2008 13:00:17 +0000 (+0000) Subject: Updated Workstation / Server generic. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3c2d76128f451410ba31cc8b89ac8e9523ce0e00;p=gosa.git Updated Workstation / Server generic. -do not send warning about installation in progress if host is from incoming git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10301 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc index f791615f6..3e494c6f1 100644 --- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc @@ -322,7 +322,7 @@ class servgeneric extends plugin } /* Warn the user, that this host is currently installing */ - if($this->currently_installing && !$this->currently_installing_warned){ + if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){ $this->currently_installing_warned = TRUE; $message[] = _("This host is currently installing, if you really want to save it, save again."); }