summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2005-08-18 22:41:37 +0000
committerStew Benedict <stewb@mandriva.org>2005-08-18 22:41:37 +0000
commit9f22e457c71c5f0969446dca31b1e0aff1b4a7e8 (patch)
tree718e77a6bdaf4f8b35c45ba9aceaaeb27c6c242d /perl-install
parent38635bdbb3f3514387718457d605ad33f84fa593 (diff)
downloaddrakx-backup-do-not-use-9f22e457c71c5f0969446dca31b1e0aff1b4a7e8.tar
drakx-backup-do-not-use-9f22e457c71c5f0969446dca31b1e0aff1b4a7e8.tar.gz
drakx-backup-do-not-use-9f22e457c71c5f0969446dca31b1e0aff1b4a7e8.tar.bz2
drakx-backup-do-not-use-9f22e457c71c5f0969446dca31b1e0aff1b4a7e8.tar.xz
drakx-backup-do-not-use-9f22e457c71c5f0969446dca31b1e0aff1b4a7e8.zip
Client tree edit fix (17653), Write to floppy (17655)
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/drakTermServ8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index b546b56c9..2a8e5d6e2 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -1027,7 +1027,8 @@ sub maintain_clients() {
$client = $value;
$citer = $iter;
} else {
- $client = '';
+ $citer = $model->iter_parent($iter);
+ $client = $model->get($citer, 0);
}
$button_edit->set_sensitive(1);
$button_config->set_sensitive(1);
@@ -1126,7 +1127,6 @@ sub maintain_clients() {
} else {
$check_hdw_config->set_active(0);
}
-
my $result = delclient($client);
if ($result == 0) {
$model->remove($citer);
@@ -1547,8 +1547,8 @@ sub write_eb_image {
if (-e "/dev/fd0") {
my $result = $in->ask_okcancel('', N("Please insert floppy disk:"));
return if !($result);
- $result = run_program::run("cat $rom_path/zdsk/$nic > /dev/fd0") if $result;
- if ($result) {
+ $result = run_program::run("cat $rom_path/zdsk/$nic > /dev/fd0");
+ if ($result == 0) {
$in->ask_warn(N("Error"), N("Could not access the floppy!"));
} else {
$in->ask_warn(N("Information"), N("Floppy can be removed now"));