Updated SIPackages

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8824 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm
index 5c68b8ec925544dc6aed3b9c7b2c975fae6f84b2..1eff3a641c11bf8f2b53eec1f65a432e33bd9316 100644 (file)
--- a/gosa-si/modules/SIPackages.pm
+++ b/gosa-si/modules/SIPackages.pm
@@ -748,16 +748,17 @@ sub new_ldap_config {
                $data{'admin_base'}= $entry->dn;
                $data{'department'}= $entry->get_value("ou");
 
-               # Fill release if available
-               my $ou= $entry->get_value("ou");
-               if (defined $ou && $ou =~ /^.* :([A-Za-z0-9\/.]+).*$/) {
-                       $data{'release'}= $1;
-               }
-
                # Append unit Tag
                $data{'unit_tag'}= $unit_tag;
        }
 
+       # Fill release if available
+       my $FAIclass= $entry->get_value("FAIclass");
+       if (defined $FAIclass && $FAIclass =~ /^.* :([A-Za-z0-9\/.]+).*$/) {
+               $data{'release'}= $1;
+       }
+
+
        # Unbind
        $mesg = $ldap->unbind;
 

diff --git a/gosa-si/modules/Utils.pm b/gosa-si/modules/Utils.pm
deleted file mode 100644 (file)
index d5954dd..0000000
--- a/gosa-si/modules/Utils.pm
+++ /dev/null
@@ -1,187 +0,0 @@
-#*********************************************************************
-#
-# GOto::Utils package -- Log parsing aid.
-#
-# (c) 2008 by Cajus Pollmeier <pollmeier@gonicus.de>
-#
-#*********************************************************************
-package GOto::Utils;
-
-use Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(process_input);
-
-use strict;
-use warnings;
-use POSIX;
-use Locale::gettext;
-use MIME::Base64;
-
-BEGIN {}
-
-END {}
-
-### Start ######################################################################
-
-# I18N setup
-setlocale(LC_MESSAGES, "");
-textdomain("fai-progress");
-
-# "Global" variables
-my $percent= 0;
-my $pkg_step= 0.0;
-my $scr_step= 0.0;
-my $action= gettext("Initializing FAI");
-
-#===  FUNCTION  ================================================================
-#         NAME: process_input
-#   PARAMETERS: received line of input
-#      RETURNS: true if stream wants us to finish
-#  DESCRIPTION: parses information from the lines and sets the progress
-#               respectively
-#===============================================================================
-sub process_input($)
-{
-  my %result;
-  my $line= shift;
-  chomp($line);
-
-  # Assume no errors
-  $result{'status'}= 0;
-
-  # Do regex
-  if ( $line =~ m/^fai-progress: hangup$/ ) {
-    $result{'status'}= -1;
-  } elsif ( $line =~ /^Calling task_confdir$/ ) {
-    %result = ( 'status' => 0, 'percent' => 0, 'task' => "task_confdir",
-                'action' => gettext("Retrieving initial client configuration"));
-  } elsif ( $line =~ /^Calling task_setup$/ ) {
-    %result = ( 'status' => 0, 'percent' => 1, 'task' => "task_setup",
-                'action' => gettext("Gathering client information"));
-  } elsif ( $line =~ /^Calling task_defclass$/ ) {
-    %result = ( 'status' => 0, 'percent' => 1, 'task' => "task_defclass",
-                'action' => gettext("Defining installation classes"));
-  } elsif ( $line =~ /^Calling task_defvar$/ ) {
-    %result = ( 'status' => 0, 'percent' => 1, 'task' => "task_defvar",
-                'action' => gettext("Defining installation variables"));
-  } elsif ( $line =~ /^Calling task_install$/ ) {
-    %result = ( 'status' => 0, 'percent' => 2, 'task' => "task_defvar",
-                'action' => gettext("Starting installation"));
-  } elsif ( $line =~ /^Calling task_partition$/ ) {
-    %result = ( 'status' => 0, 'percent' => 2, 'task' => "task_partition",
-                'action' => gettext("Inspecting harddisks"));
-  } elsif ( $line =~ /^Creating partition table$/ ) {
-    %result = ( 'status' => 0, 'percent' => 2, 'task' => "task_partition",
-                'action' => gettext("Partitioning harddisk"));
-  } elsif ( $line =~ /^Creating file systems$/ ) {
-    %result = ( 'status' => 0, 'percent' => 3, 'task' => "task_partition",
-                'action' => gettext("Creating filesystems"));
-  } elsif ( $line =~ /^Calling task_mountdisks$/ ) {
-    %result = ( 'status' => 0, 'percent' => 3, 'task' => "task_mountdisks",
-                'action' => gettext("Mounting filesystems"));
-
-  # Original FAI counting, no possibility to do anything here...
-  } elsif ( $line =~ /^Calling task_extrbase$/ ) {
-    %result = ( 'status' => 0, 'percent' => 3, 'task' => "task_extrbase",
-                'action' => gettext("Bootstrapping base system"));
-
-  # Using debootstrap for boostrapping is a bit more wise in at this point. Start at 3% and grow to approx 15%.
-  } elsif ( $line =~ /^HOOK extrbase/ ) {
-    %result = ( 'status' => 0, 'percent' => 3, 'task' => "task_extrbase",
-                'action' => gettext("Bootstrapping base system"));
-    $percent= 3;
-  } elsif ( $line =~ /^I: Retrieving (.+)$/ ) {
-    $percent= ($percent > 15) ? 15 : $percent + 0.025;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_extrbase",
-                'action' => gettext("Bootstrapping base system").": ".sprintf(gettext("Retrieving %s..."), $1));
-  } elsif ( $line =~ /^I: Extracting (.+)$/ ) {
-    $percent= ($percent > 15) ? 15 : $percent + 0.025;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_extrbase",
-                'action' => gettext("Bootstrapping base system").": ".sprintf(gettext("Extracting %s..."), $1));
-  } elsif ( $line =~ /^I: Validating (.+)$/ ) {
-    $percent= ($percent > 15) ? 15 : $percent + 0.025;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_extrbase",
-                'action' => gettext("Bootstrapping base system").": ".sprintf(gettext("Validating %s..."), $1));
-  } elsif ( $line =~ /^I: Unpacking (.+)$/ ) {
-    $percent= ($percent > 15) ? 15 : $percent + 0.025;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_extrbase",
-                'action' => gettext("Bootstrapping base system").": ".sprintf(gettext("Unpacking %s..."), $1));
-  } elsif ( $line =~ /^I: Configuring (.+)$/ ) {
-    $percent= ($percent > 15) ? 15 : $percent + 0.025;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_extrbase",
-                'action' => gettext("Bootstrapping base system").": ".sprintf(gettext("Configuring %s..."), $1));
-  } elsif ( $line =~ /^Calling task_debconf$/ ) {
-    %result = ( 'status' => 0, 'percent' => 15, 'task' => "task_debconf",
-                'action' => gettext("Configuring base system"));
-  } elsif ( $line =~ /^Calling task_prepareapt$/ ) {
-    %result = ( 'status' => 0, 'percent' => 15, 'task' => "task_prepareapt",
-                'action' => gettext("Preparing network install"));
-  } elsif ( $line =~ /^Calling task_updatebase$/ ) {
-    %result = ( 'status' => 0, 'percent' => 15, 'task' => "task_updatebase",
-                'action' => gettext("Updating base system"));
-  } elsif ( $line =~ /^Calling task_instsoft$/ ) {
-    %result = ( 'status' => 0, 'percent' => 16, 'task' => "task_instsoft",
-                'action' => gettext("Gathering information for package lists"));
-  } elsif ( $line =~ /([0-9]+) packages upgraded, ([0-9]+) newly installed/ ) {
-    if (($1 + $2) != 0){
-      $pkg_step= 69.0 / ($1 + $2) / 3.0;
-    }
-    $percent= 16.0;
-  } elsif ( $line =~ /Get:[0-9]+ [^ ]+ [^ ]+ ([^ ]+)/ ) {
-    $percent+= $pkg_step;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_instsoft",
-                'action' => gettext("Software installation").": ".sprintf(gettext("Retrieving %s..."), $1));
-  } elsif ( $line =~ /Unpacking ([^ ]+) .*from/ ) {
-    $percent+= $pkg_step;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_instsoft",
-                'action' => gettext("Software installation").": ".sprintf(gettext("Extracting %s..."), $1));
-  } elsif ( $line =~ /Setting up ([^ ]+)/ ) {
-    $percent+= $pkg_step;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_instsoft",
-                'action' => gettext("Software installation").": ".sprintf(gettext("Configuring %s..."), $1));
-  } elsif ( $line =~ /^Calling task_configure$/ ) {
-    %result = ( 'status' => 0, 'percent' => 80, 'task' => "task_configure",
-                'action' => gettext("Software installation").": ".gettext("Adapting system and package configuration"));
-  } elsif ( $line =~ /^Script count: ([0-9]+)$/ ) {
-    $percent= 85.0;
-    $scr_step= 15.0 / $1;
-  } elsif ( $line =~ /^Executing +([^ ]+): ([^\n ]+)$/ ) {
-    $percent+= $scr_step;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_configure",
-                'action' => sprintf(gettext("Running script %s (%s)..."), $1, $2));
-  } elsif ( $line =~ /^Calling task_savelog$/ ) {
-    $percent= 100;
-    %result = ( 'status' => 0, 'percent' => floor($percent), 'task' => "task_savelog",
-                'action' => gettext("Installation finished"));
-
-  # Status evaluation
-  } elsif ( $line =~ /^TASKEND ([^ ]+) ([0-9]+)$/ ) {
-    if ($2 != 0){
-      %result = ( 'status' => $2, 'task' => "$1");
-    }
-
-  # Common errors
-  } elsif ( $line =~ /^goto-error-([^:]+)$/ ) {
-      %result = ( 'status' => 5, 'task' => "error-$1");
-  } elsif ( $line =~ /^goto-error-([^:]+):(.*)$/ ) {
-      %result = ( 'status' => 6, 'task' => "error-$1", 'action' => "$2");
-  } elsif ( $line =~ /^ldap2fai-error:(.*)$/ ) {
-      my $message= decode_base64("$1");
-      $message =~ tr/\n/\n .\n /;
-      %result = ( 'status' => 7, 'task' => "ldap2fai-error", 'action' => $message);
-
-  # GOto built ins
-  } elsif ( $line =~ /^goto-hardware-detection start$/ ) {
-      %result = ( 'status' => 0, 'task' => "goto-hardware-detection-start", 'action' => gettext("Detecting hardware"));
-  } elsif ( $line =~ /^goto-hardware-detection stop$/ ) {
-      %result = ( 'status' => 0, 'task' => "goto-hardware-detection-stop", 'action' => gettext("Inventarizing hardware information"));
-  } elsif ( $line =~ m/^goto-activation start$/ ) {
-      %result = ( 'status' => 0, 'task' => "goto-activation-start", 'action' => gettext("Waiting for the system to be activated"));
-  } elsif ( $line =~ m/^goto-activation stop$/ ) {
-      %result = ( 'status' => 0, 'task' => "goto-activation-stop", 'action' => gettext("System activated - retrieving configuration"));
-  }
-
-  return \%result;
-}
-
-1;