GosaPackages.pm: it is not allowed to add 2x the same job-msg to the job queue

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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index acd69d35d3dcbd4f0a8ff60928d9323e5d93de3f..5b125a6c137d547a58ad022098385137984b8546 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1986,7 +1986,7 @@ sub change_goto_state {
           }
         }
       } else {
-               daemon_log("$session_id ERROR: LDAP search failed: ldap_base=$ldap_base, filter=$search", 1);
+               daemon_log("$session_id ERROR: LDAP search failed in function change_goto_state: ldap_base=$ldap_base, filter=$search", 1);
          }
 
     }

diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm
index cd11a453528bb30e96f003a25a31c9c6f30d73a7..3505dbb68573ec2060a767189b9b977c69509306 100644 (file)
--- a/gosa-si/modules/DBsqlite.pm
+++ b/gosa-si/modules/DBsqlite.pm
@@ -157,7 +157,7 @@ sub add_dbentry {
                        return (4, $sql_statement);
                } 
 
-               # entry already exists -> run update
+       # entry already exists -> run update
        } else  {
                my @update_l;
                while( my ($pram, $val) = each %{$arg} ) {

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index d5ddd23ee2419279e3ec8f5579c85158801070a4..3b49240d348e8495843f23bfff60bb12fc102755 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -389,7 +389,7 @@ sub process_job_msg {
     if( $error == 0 ) {
         # add job to job queue
         my $func_dic = {table=>$main::job_queue_tn, 
-            primkey=>[],
+            primkey=>['macaddress', 'headertag'],
             timestamp=>$timestamp,
             status=>'waiting', 
             result=>'none',