Code

change function get_where_statement, to handle the INTEGER column id
[gosa.git] / gosa-si / gosa-si-server
index e900c5b3849f0ee10883f79c29d3ecb0b648db68..612e01436e23a97e714b42aeff87bc46e63dad8d 100755 (executable)
@@ -107,7 +107,9 @@ $ping_timeout = 5;
 $no_bus = 0;
 $bus_activ = "true";
 $no_arp = 0;
-my $packages_list_under_construction = 0;
+my $packages_list_under_construction = "/tmp/packages_list_creation_in_progress";
+my @packages_list_statements;
+my $watch_for_new_jobs_in_progress = 0;
 
 our $prg= basename($0);
 
@@ -956,7 +958,7 @@ sub update_jobdb_status_for_send_msgs {
             if (not $answer =~ /<header>trigger_action_reinstall<\/header>/) {
                 my $sql_statement = "UPDATE $job_queue_tn ".
                     "SET status='error', result='can not deliver msg, please consult log file' ".
-                    "WHERE id='$jobdb_id'";
+                    "WHERE id=$jobdb_id";
                 my $res = $job_db->update_dbentry($sql_statement);
             }
 
@@ -964,7 +966,7 @@ sub update_jobdb_status_for_send_msgs {
         } else {
             my $sql_statement = "UPDATE $job_queue_tn ".
                 "SET status='done' ".
-                "WHERE id='$jobdb_id' AND status='processed'";
+                "WHERE id=$jobdb_id AND status='processed'";
             my $res = $job_db->update_dbentry($sql_statement);
         }
     }
@@ -1247,10 +1249,11 @@ sub trigger_db_loop {
        my ($kernel) = @_ ;
        $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
        $kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay); 
-    $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay);
-    $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay);
+       $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay);
+       $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay);
 }
 
+
 sub watch_for_done_jobs {
     my ($kernel,$heap) = @_[KERNEL, HEAP];
 
@@ -1260,91 +1263,107 @@ sub watch_for_done_jobs {
 
     while( my ($id, $hit) = each %{$res} ) {
         my $jobdb_id = $hit->{id};
-        my $sql_statement = "DELETE FROM $job_queue_tn WHERE id='$jobdb_id'"; 
-        my $res = $job_db->del_dbentry($sql_statement);
+        my $sql_statement = "DELETE FROM $job_queue_tn WHERE id=$jobdb_id"; 
+        my $res = $job_db->del_dbentry($sql_statement);        
     }
 
     $kernel->delay_set('watch_for_done_jobs',$job_queue_loop_delay);
 }
 
+
 sub watch_for_new_jobs {
-       my ($kernel,$heap) = @_[KERNEL, HEAP];
-
-       # check gosa job queue for jobs with executable timestamp
-       my $timestamp = &get_time();
-       my $sql_statement = "SELECT * FROM $job_queue_tn WHERE status='waiting' AND (CAST (timestamp AS INTEGER)) < $timestamp ORDER BY timestamp";
-       my $res = $job_db->exec_statement( $sql_statement );
-
-       # Merge all new jobs that would do the same actions
-       my @drops;
-       my $hits;
-       foreach my $hit (reverse @{$res} ) {
-               my $macaddress= lc @{$hit}[8];
-               my $headertag= @{$hit}[5];
-               if(defined($hits->{$macaddress}->{$headertag})) {
-                       push @drops, "DELETE FROM $job_queue_tn WHERE id = '$hits->{$macaddress}->{$headertag}[0]'";
+       if($watch_for_new_jobs_in_progress == 0) {
+               $watch_for_new_jobs_in_progress = 1;
+               my ($kernel,$heap) = @_[KERNEL, HEAP];
+
+               # check gosa job queue for jobs with executable timestamp
+               my $timestamp = &get_time();
+               my $sql_statement = "SELECT * FROM $job_queue_tn WHERE status='waiting' AND (CAST (timestamp AS INTEGER)) < $timestamp ORDER BY timestamp";
+               my $res = $job_db->exec_statement( $sql_statement );
+
+               # Merge all new jobs that would do the same actions
+               my @drops;
+               my $hits;
+               foreach my $hit (reverse @{$res} ) {
+                       my $macaddress= lc @{$hit}[8];
+                       my $headertag= @{$hit}[5];
+                       if(
+                               defined($hits->{$macaddress}) &&
+                               defined($hits->{$macaddress}->{$headertag}) &&
+                               defined($hits->{$macaddress}->{$headertag}[0])
+                       ) {
+                               push @drops, "DELETE FROM $job_queue_tn WHERE id = $hits->{$macaddress}->{$headertag}[0]";
+                       }
+                       $hits->{$macaddress}->{$headertag}= $hit;
                }
-               $hits->{$macaddress}->{$headertag}= $hit;
-       }
 
-       # Delete new jobs with a matching job in state 'processing'
-       foreach my $macaddress (keys %{$hits}) {
-               foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
-                       my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
-                       my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND headertag='$jobdb_headertag' AND status='processing'";
-                       my $res = $job_db->exec_statement( $sql_statement );
-                       foreach my $hit (@{$res}) {
-                               push @drops, "DELETE FROM $job_queue_tn WHERE id = '$jobdb_id'";
+               # Delete new jobs with a matching job in state 'processing'
+               foreach my $macaddress (keys %{$hits}) {
+                       foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
+                               my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
+                               if(defined($jobdb_id)) {
+                                       my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND headertag='$jobdb_headertag' AND status='processing'";
+                                       my $res = $job_db->exec_statement( $sql_statement );
+                                       foreach my $hit (@{$res}) {
+                                               push @drops, "DELETE FROM $job_queue_tn WHERE id=$jobdb_id";
+                                       }
+                               } else {
+                                       daemon_log("J ERROR: Job without id exists for macaddress $macaddress!", 1);
+                               }
                        }
                }
-       }
 
-       # Commit deletion
-       $job_db->exec_statementlist(\@drops);
+               # Commit deletion
+               $job_db->exec_statementlist(\@drops);
 
-       # Look for new jobs that could be executed
-       foreach my $macaddress (keys %{$hits}) {
+               # Look for new jobs that could be executed
+               foreach my $macaddress (keys %{$hits}) {
 
-               # Look if there is an executing job
-               my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND status='processing'";
-               my $res = $job_db->exec_statement( $sql_statement );
+                       # Look if there is an executing job
+                       my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND status='processing'";
+                       my $res = $job_db->exec_statement( $sql_statement );
 
-               # Skip new jobs for host if there is a processing job
-               if(defined($res) and defined @{$res}[0]) {
-                       next;
-               }
+                       # Skip new jobs for host if there is a processing job
+                       if(defined($res) and defined @{$res}[0]) {
+                               next;
+                       }
 
-               foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
-                       my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
-                       my $job_msg = @{$hits->{$macaddress}->{$jobdb_headertag}}[7];
+                       foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
+                               my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
+                               if(defined($jobdb_id)) {
+                                       my $job_msg = @{$hits->{$macaddress}->{$jobdb_headertag}}[7];
 
-                       daemon_log("J DEBUG: its time to execute $job_msg", 7);
-                       my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'";
-                       my $res_hash = $known_clients_db->select_dbentry( $sql_statement );
+                                       daemon_log("J DEBUG: its time to execute $job_msg", 7);
+                                       my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'";
+                                       my $res_hash = $known_clients_db->select_dbentry( $sql_statement );
 
-                       # expect macaddress is unique!!!!!!
-                       my $target = $res_hash->{1}->{hostname};
+                                       # expect macaddress is unique!!!!!!
+                                       my $target = $res_hash->{1}->{hostname};
 
-                       # change header
-                       $job_msg =~ s/<header>job_/<header>gosa_/;
+                                       # change header
+                                       $job_msg =~ s/<header>job_/<header>gosa_/;
 
-                       # add sqlite_id
-                       $job_msg =~ s/<\/xml>$/<jobdb_id>$jobdb_id<\/jobdb_id><\/xml>/;
+                                       # add sqlite_id
+                                       $job_msg =~ s/<\/xml>$/<jobdb_id>$jobdb_id<\/jobdb_id><\/xml>/;
 
-                       $job_msg =~ /<header>(\S+)<\/header>/;
-                       my $header = $1 ;
-                       my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J");
+                                       $job_msg =~ /<header>(\S+)<\/header>/;
+                                       my $header = $1 ;
+                                       my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J");
 
-                       # update status in job queue to 'processing'
-                       $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id='$jobdb_id'";
-                       my $res = $job_db->update_dbentry($sql_statement);
+                                       # update status in job queue to 'processing'
+                                       $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id=$jobdb_id";
+                                       my $res = $job_db->update_dbentry($sql_statement);
+# TODO: abfangen ob alles in ordnung ist oder nicht, wenn nicht error schmeißen                                       
 
-                       # We don't want parallel processing
-                       last;
+                                       # We don't want parallel processing
+                                       last;
+                               }
+                       }
                }
-       }
 
-       $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
+               $watch_for_new_jobs_in_progress = 0;
+               $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
+       }
 }
 
 
@@ -1731,7 +1750,7 @@ sub create_fai_release_db {
                                unshift @sql_list, "DELETE FROM $table_name";   # at first, clear db
                                $fai_release_db->exec_statementlist(\@sql_list);
                        }
-                       daemon_log("$session_id DEBUG: Done with inserting",6);
+                       daemon_log("$session_id DEBUG: Done with inserting",7);
                }
                daemon_log("$session_id INFO: create_fai_release_db: finished",5);
        }
@@ -1780,14 +1799,14 @@ sub resolve_fai_classes {
        my $fai_filter= "(|(&(objectClass=FAIclass)(|(objectClass=".join(")(objectClass=", @possible_fai_classes).")))(objectClass=FAIbranch))";
        my $fai_classes;
 
-       daemon_log("$session_id DEBUG: Searching for FAI entries in base $fai_base",6);
+       daemon_log("$session_id DEBUG: Searching for FAI entries in base $fai_base",7);
        my $mesg= $ldap_handle->search(
                base   => $fai_base,
                scope  => 'sub',
                attrs  => ['cn','objectClass','FAIstate'],
                filter => $fai_filter,
        );
-       daemon_log("$session_id DEBUG: Found ".$mesg->count()." FAI entries",6);
+       daemon_log("$session_id DEBUG: Found ".$mesg->count()." FAI entries",7);
 
        if($mesg->{'resultCode'} == 0 &&
                $mesg->count != 0) {
@@ -1978,24 +1997,31 @@ sub session_run_done {
     delete $heap->{task}->{$task_id};
 }
 
+
 sub create_sources_list {
-    my $ldap_handle = &get_ldap_handle;
+       my $session_id = shift;
+       my $ldap_handle = &main::get_ldap_handle;
        my $result="/tmp/gosa_si_tmp_sources_list";
 
        # Remove old file
        if(stat($result)) {
                unlink($result);
+               &main::daemon_log("$session_id DEBUG: remove an old version of '$result'", 7); 
        }
 
        my $fh;
-       open($fh, ">$result") or return undef;
-       if(defined($ldap_server_dn) and length($ldap_server_dn) > 0) {
+       open($fh, ">$result");
+       if (not defined $fh) {
+               &main::daemon_log("$session_id DEBUG: cannot open '$result' for writing", 7); 
+               return undef;
+       }
+       if(defined($main::ldap_server_dn) and length($main::ldap_server_dn) > 0) {
                my $mesg=$ldap_handle->search(
-                               base    => $ldap_server_dn,
-                               scope   => 'base',
-                               attrs   => 'FAIrepository',
-                               filter  => 'objectClass=FAIrepositoryServer'
-                               );
+                       base    => $main::ldap_server_dn,
+                       scope   => 'base',
+                       attrs   => 'FAIrepository',
+                       filter  => 'objectClass=FAIrepositoryServer'
+               );
                if($mesg->count) {
                        foreach my $entry(@{$mesg->{'entries'}}) {
                                foreach my $value(@{$entry->get_value('FAIrepository', asref => 1)}) {
@@ -2007,6 +2033,8 @@ sub create_sources_list {
                                }
                        }
                }
+       } else {
+               &main::daemon_log("$session_id ERROR: something wrong with ldap_server_dn '$main::ldap_server_dn', abort create_sources_list", 1); 
        }
        close($fh);
 
@@ -2029,7 +2057,20 @@ sub run_create_packages_list_db {
 
 
 sub create_packages_list_db {
-    my ($ldap_handle, $sources_file, $session_id);
+       my ($ldap_handle, $sources_file, $session_id) = @_;
+       
+       # it should not be possible to trigger a recreation of packages_list_db
+       # while packages_list_db is under construction, so set flag packages_list_under_construction
+       # which is tested befor recreation can be started
+       if (-r $packages_list_under_construction) {
+               daemon_log("$session_id WARNING: packages_list_db is right now under construction, please wait until this process is finished", 3);
+               return;
+       } else {
+               daemon_log("$session_id INFO: create_packages_list_db: start", 5); 
+               # set packages_list_under_construction to true
+               system("touch $packages_list_under_construction");
+               @packages_list_statements=undef;
+       }
 
        if (not defined $session_id) { $session_id = 0; }
        if (not defined $ldap_handle) { 
@@ -2037,107 +2078,106 @@ sub create_packages_list_db {
 
                if (not defined $ldap_handle) {
                        daemon_log("$session_id ERROR: no ldap_handle available to create_packages_list_db", 1);
+                       unlink($packages_list_under_construction);
                        return;
                }
        }
-    if (not defined $sources_file) { 
-        $sources_file = &create_sources_list;
-    }
+       if (not defined $sources_file) { 
+               &main::daemon_log("$session_id INFO: no sources_file given for creating packages list so trigger creation of it", 5); 
+               $sources_file = &create_sources_list($session_id);
+       }
 
-       # it should not be possible to trigger a recreation of packages_list_db
-       # while packages_list_db is under construction, so set flag packages_list_under_construction
-       # which is tested befor recreation can be started
-       if ($packages_list_under_construction) {
-                       daemon_log("$session_id WARNING: packages_list_db is right now under construction, please wait untill this process is finished", 3);
-                       return;
-       } else {
-                       daemon_log("$session_id INFO: create_packages_list_db: start", 5); 
-                       # set packages_list_under_construction to true
-                       $packages_list_under_construction = 1;
+       if (not defined $sources_file) {
+               &main::daemon_log("$session_id ERROR: no sources_file given under '$sources_file', skip create_packages_list_db", 1); 
+               unlink($packages_list_under_construction);
+               return;
        }
+
        my $line;
 
-    open(CONFIG, "<$sources_file") or do {
-        daemon_log( "$session_id ERROR: create_packages_list_db: Failed to open '$sources_file'", 1);
-        return;
-    };
-    
-    # Read lines
-    while ($line = <CONFIG>){
-        # Unify
-        chop($line);
-        $line =~ s/^\s+//;
-        $line =~ s/^\s+/ /;
+       open(CONFIG, "<$sources_file") or do {
+               daemon_log( "$session_id ERROR: create_packages_list_db: Failed to open '$sources_file'", 1);
+               unlink($packages_list_under_construction);
+               return;
+       };
 
-        # Strip comments
-        $line =~ s/#.*$//g;
+       # Read lines
+       while ($line = <CONFIG>){
+               # Unify
+               chop($line);
+               $line =~ s/^\s+//;
+               $line =~ s/^\s+/ /;
 
-        # Skip empty lines
-        if ($line =~ /^\s*$/){
-            next;
-        }
+               # Strip comments
+               $line =~ s/#.*$//g;
 
-        # Interpret deb line
-        if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){
-            my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/);
-            my $section;
-            foreach $section (split(' ', $sections)){
-                &parse_package_info( $baseurl, $dist, $section, $session_id );
-            }
-        }
-    }
+               # Skip empty lines
+               if ($line =~ /^\s*$/){
+                       next;
+               }
 
-    close (CONFIG);
+               # Interpret deb line
+               if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){
+                       my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/);
+                       my $section;
+                       foreach $section (split(' ', $sections)){
+                               &parse_package_info( $baseurl, $dist, $section, $session_id );
+                       }
+               }
+       }
 
-    daemon_log("$session_id INFO: create_packages_list_db: finished", 5); 
-       # set packages_list_under_construction to false
-       $packages_list_under_construction = 0;
+       close (CONFIG);
 
-    return;
+       find(\&cleanup_and_extract, keys( %repo_dirs ));
+       $packages_list_db->exec_statementlist(\@packages_list_statements);
+       unlink($packages_list_under_construction);
+       daemon_log("$session_id INFO: create_packages_list_db: finished", 5); 
+       return;
 }
 
 
 sub parse_package_info {
-  my ($baseurl, $dist, $section, $session_id)= @_;
-  my ($package);
-       if (not defined $session_id) { $session_id = 0; }
-  my ($path) = ($baseurl =~ m%://[^/]*(.*)$%);
-  $repo_dirs{ "${repo_path}/pool" } = 1;
-
-  foreach $package ("Packages.gz"){
-    daemon_log("$session_id DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7);
-    get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section", $session_id );
-    parse_package( "$outdir/$dist/$section", $dist, $path, $session_id );
-  }
-  find(\&cleanup_and_extract, keys( %repo_dirs ));
+    my ($baseurl, $dist, $section, $session_id)= @_;
+    my ($package);
+    if (not defined $session_id) { $session_id = 0; }
+    my ($path) = ($baseurl =~ m%://[^/]*(.*)$%);
+    $repo_dirs{ "${repo_path}/pool" } = 1;
+
+    foreach $package ("Packages.gz"){
+        daemon_log("$session_id DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7);
+        get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section", $session_id );
+        parse_package( "$outdir/$dist/$section", $dist, $path, $session_id );
+    }
+    
 }
 
 
 sub get_package {
-  my ($url, $dest, $session_id)= @_;
-  if (not defined $session_id) { $session_id = 0; }
-
-  my $tpath = dirname($dest);
-  -d "$tpath" || mkpath "$tpath";
-
-  # This is ugly, but I've no time to take a look at "how it works in perl"
-  if(0 == system("wget '$url' -O '$dest' 2>/dev/null") ) {
-      system("gunzip -cd '$dest' > '$dest.in'");
-         daemon_log("$session_id DEBUG: run command: gunzip -cd '$dest' > '$dest.in'", 5);
-#      unlink($dest);
-         daemon_log("$session_id DEBUG: delete file '$dest'", 5); 
-  } else {
-      daemon_log("$session_id ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1);
-  }
-  return 0;
+    my ($url, $dest, $session_id)= @_;
+    if (not defined $session_id) { $session_id = 0; }
+
+    my $tpath = dirname($dest);
+    -d "$tpath" || mkpath "$tpath";
+
+    # This is ugly, but I've no time to take a look at "how it works in perl"
+    if(0 == system("wget '$url' -O '$dest' 2>/dev/null") ) {
+        system("gunzip -cd '$dest' > '$dest.in'");
+        daemon_log("$session_id DEBUG: run command: gunzip -cd '$dest' > '$dest.in'", 5);
+        unlink($dest);
+        daemon_log("$session_id DEBUG: delete file '$dest'", 5); 
+    } else {
+        daemon_log("$session_id ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1);
+    }
+    return 0;
 }
 
+
 sub parse_package {
     my ($path, $dist, $srv_path, $session_id)= @_;
-       if (not defined $session_id) { $session_id = 0;}
+    if (not defined $session_id) { $session_id = 0;}
     my ($package, $version, $section, $description);
-    my @sql_list;
     my $PACKAGES;
+    my $timestamp = &get_time();
 
     if(not stat("$path.in")) {
         daemon_log("$session_id ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1);
@@ -2145,7 +2185,7 @@ sub parse_package {
     }
 
     open($PACKAGES, "<$path.in");
-       if(not defined($PACKAGES)) {
+    if(not defined($PACKAGES)) {
         daemon_log("$session_id ERROR: create_packages_list_db: parse_package: cannot open '$path.in'",1); 
         return;
     }
@@ -2158,8 +2198,8 @@ sub parse_package {
 
         # Use empty lines as a trigger
         if ($line =~ /^\s*$/){
-            my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '0')";
-            push(@sql_list, $sql);
+            my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '$timestamp')";
+            push(@packages_list_statements, $sql);
             $package = "none";
             $version = "none";
             $section = "none";
@@ -2191,68 +2231,69 @@ sub parse_package {
             next;
         }
 
-       # Trigger for filename
-       if ($line =~ /^Filename:\s/){
-               my ($filename) = ($line =~ /^Filename: (.*)$/);
-               store_fileinfo( $package, $filename, $dist, $srv_path, $version, $repo_path );
-               next;
-       }
+        # Trigger for filename
+        if ($line =~ /^Filename:\s/){
+            my ($filename) = ($line =~ /^Filename: (.*)$/);
+            store_fileinfo( $package, $filename, $dist, $srv_path, $version, $repo_path );
+            next;
+        }
     }
 
     close( $PACKAGES );
-#    unlink( "$path.in" );
-    
-    $packages_list_db->exec_statementlist(\@sql_list);
+    unlink( "$path.in" );
+    &main::daemon_log("$session_id DEBUG: unlink '$path.in'", 1); 
 }
 
+
 sub store_fileinfo {
-  my( $package, $file, $dist, $path, $vers, $srvdir) = @_;
+    my( $package, $file, $dist, $path, $vers, $srvdir) = @_;
 
-  my %fileinfo = (
-    'package' => $package,
-    'dist' => $dist,
-    'version' => $vers,
-  );
+    my %fileinfo = (
+        'package' => $package,
+        'dist' => $dist,
+        'version' => $vers,
+    );
 
-  $repo_files{ "${srvdir}/$file" } = \%fileinfo;
+    $repo_files{ "${srvdir}/$file" } = \%fileinfo;
 }
 
+
 sub cleanup_and_extract {
-       my ($session_id) = @_;
-       if (not defined $session_id) { $session_id  = 0; }              
-               my $fileinfo = $repo_files{ $File::Find::name };
+    my $fileinfo = $repo_files{ $File::Find::name };
 
-               if( defined $fileinfo ) {
+    if( defined $fileinfo ) {
 
-                               my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d";
-                               my $sql;
-                               my $package = $fileinfo->{ 'package' };
-                               my $newver = $fileinfo->{ 'version' };
+        my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d";
+        my $sql;
+        my $package = $fileinfo->{ 'package' };
+        my $newver = $fileinfo->{ 'version' };
 
-                               mkpath($dir);
-                               system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" );
+        mkpath($dir);
+        system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" );
 
-                               if( -f "$dir/DEBIAN/templates" ) {
+        if( -f "$dir/DEBIAN/templates" ) {
 
-                                               daemon_log("$session_id DEBUG: Found debconf templates in '$package' - $newver", 5);
+            daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5);
 
-                                               my $tmpl= "";
-                                               {
-                                                               local $/=undef;
-                                                               open FILE, "$dir/DEBIAN/templates";
-                                                               $tmpl = &encode_base64(<FILE>);
-                                                               close FILE;
-                                               }
-                                               rmtree("$dir/DEBIAN/templates");
+            my $tmpl= "";
+            {
+                local $/=undef;
+                open FILE, "$dir/DEBIAN/templates";
+                $tmpl = &encode_base64(<FILE>);
+                close FILE;
+            }
+            rmtree("$dir/DEBIAN/templates");
 
-                                               $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';";
+            $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';";
 
-                               } else {
-                                               $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';";
-                               }
+        } else {
+            $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';";
+        }
 
-                               my $res= $main::packages_list_db->update_dbentry($sql);
-               }
+        push @packages_list_statements, $sql;
+    }
+
+    return;
 }
 
 
@@ -2335,6 +2376,7 @@ $fai_release_db->create_table($fai_release_tn, \@fai_release_col_names);
 
 # connect to packages_list_db
 unlink($packages_list_file_name);
+unlink($packages_list_under_construction);
 $packages_list_db = GOSA::DBsqlite->new($packages_list_file_name);
 $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names);