From cd139422eb2b50acc4e2c59ce74ee26e998d267b Mon Sep 17 00:00:00 2001 From: janw Date: Mon, 21 Jan 2008 13:03:19 +0000 Subject: [PATCH] Some Fixes... git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8519 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/gosa-si-client | 13 ++++++------- gosa-si/modules/GosaPackages.pm | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client index 69a5f7ffd..54884536a 100755 --- a/gosa-si/gosa-si-client +++ b/gosa-si/gosa-si-client @@ -142,13 +142,12 @@ sub daemon_log { sub check_cmdline_param () { my $err_config; my $err_counter = 0; - if( not defined( $cfg_file)) { - #$err_config = "please specify a config file"; - #$err_counter += 1; - my $cwd = getcwd; - my $name = "/etc/gosa-si/client.conf"; - $cfg_file = File::Spec->catfile( $cwd, $name ); - print STDERR "no conf file specified\n try to use default: $cfg_file\n"; + if(not defined($cfg_file)) { + $cfg_file = "/etc/gosa-si/client.conf"; + if(! -r $cfg_file) { + $err_config = "please specify a config file"; + $err_counter += 1; + } } if( $err_counter > 0 ) { &usage( "", 1 ); diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index 94714e384..6872485d5 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -311,9 +311,9 @@ sub process_incoming_msg { if ($out_msg =~ /(\d*?)<\/jobdb_id>/) { my $job_id = $1; - my $sql = "BEGIN TRANSATION; UPDATE '".$main::job_queue_table_name. + my $sql = "UPDATE '".$main::job_queue_table_name. "' SET status='done', result='".$out_msg. - "' WHERE id='$job_id'; COMMIT;"; + "' WHERE id='$job_id'"; my $res = $main::job_db->exec_statement($sql); return; -- 2.30.2