From 8d29bdb159480b7372cb7955f249356ef7ebc535 Mon Sep 17 00:00:00 2001 From: rettenbe Date: Mon, 18 Aug 2008 08:49:37 +0000 Subject: [PATCH] * bugfix: gosa-si-server, wrong if clause * delete debug line git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12228 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/gosa-si-server | 5 +++-- gosa-si/tests/client.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 7e8f395ab..2678284e9 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -451,6 +451,7 @@ sub import_modules { } } } + close (DIR); } @@ -1511,8 +1512,8 @@ sub watch_for_opsi_jobs { }; my $hres = $opsi_client->call($opsi_url, $callobj); - my ($hres_err, $hres_err_string) = &check_opsi_res($hres); - if (&check_opsi_res($hres)) { + #my ($hres_err, $hres_err_string) = &check_opsi_res($hres); + if (not &check_opsi_res($hres)) { my $htmp= $hres->result->{$hostId}; # Check state != not_installed or action == setup -> load and add diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php index cf0843f48..65512c140 100755 --- a/gosa-si/tests/client.php +++ b/gosa-si/tests/client.php @@ -148,14 +148,14 @@ for($count = 1; $count <= $zahl; $count++) #$data = "
gosa_opsi_get_client_software
GOSA GOSA limux-cl-2.intranet.gonicus.de
"; # List Opsi clients - $data = "
gosa_opsi_list_clients
GOSA GOSA
"; + #$data = "
gosa_opsi_list_clients
GOSA GOSA
"; # Delete Opsi client #$data = "
gosa_opsi_del_client
GOSA 00:01:6c:9d:b9:fa limux-cl-2.intranet.gonicus.de
"; # Install Opsi client # Please do always use 'job_...' and never 'gosa_...' otherways the job will never appear in job queue - #$data = "
job_opsi_install_client
GOSA 00:01:6c:9d:b9:fa limux-cl-2.intranet.gonicus.de 00:11:25:4b:8c:e5
"; + $data = "
job_opsi_install_client
GOSA 00:01:6c:9d:b9:fa limux-cl-2.intranet.gonicus.de 00:11:25:4b:8c:e5
"; # Add Opsi client #$data = "
gosa_opsi_add_client
GOSA 00:01:6c:9d:b9:fa limux-cl-2.intranet.gonicus.de 00:11:25:4b:8c:e5 Test halt 1.2.3.4 Im a note
"; -- 2.30.2