From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 5 Jun 2008 09:37:35 +0000 (+0000)
Subject: GosaPackages.pm: it is not allowed to add 2x the same job-msg to the job queue
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=159e04891c6f4dde96cc33b95fd63d124ddb7328;p=gosa.git

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 acd69d35d..5b125a6c1 100755
--- 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 cd11a4535..3505dbb68 100644
--- 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 d5ddd23ee..3b49240d3 100644
--- 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',