diff options
| -rw-r--r-- | perl-install/ChangeLog | 1 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/printer.pm | 9 |
3 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index f8aaacc0f..90bfa7245 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -10,6 +10,7 @@ * modules.pm: updated alias for sparc*. * any.pm: fixed proprable wrong test for setupBootloader in beginner at the very beginning. + * printer.pm: fixed typo. 2000-05-24 François Pons <fpons@mandrakesoft.com> diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index fbc26734b..088baa492 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1004,7 +1004,7 @@ sub setupXfree { _("DrakX will generate config files for both XFree 3.3 and XFree 4.0. By default, the 3.3 server is used because it works on more graphic cards. -Do you want to try XFree 4.0?")) if $::expert; +Do you want to try XFree 4.0?")) if $::expert && arch() != /sparc/; #- strange, xfs must not be started twice... #- trying to stop and restart it does nothing good too... diff --git a/perl-install/printer.pm b/perl-install/printer.pm index c720e8d13..704c45ec6 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -430,9 +430,9 @@ sub copy_master_filter($) { my $complete_path = "$prefix/$queue_path/filter"; my $master_filter = "$prefix/$PRINTER_FILTER_DIR/master-filter"; - eval { commands::cp('-f', $master_filter, $complete_path); - commands::cp("root.lp", $complete_path); }; #- -f for update. + eval { commands::cp('-f', $master_filter, $complete_path) }; $@ and die "Can't copy $master_filter to $complete_path $!"; + eval { commands::chown_("root.lp", $complete_path); }; } #------------------------------------------------------------------------------ @@ -633,6 +633,8 @@ sub configure_queue($) { print F "user='$entry->{SMBUSER}'\n"; print F "password='$entry->{SMBPASSWD}'\n"; print F "workgroup='$entry->{SMBWORKGROUP}'\n"; + close F; + eval { chmod 0640, $config_file; commands::chown_("root.lp", $config_file) }; } elsif ($entry->{TYPE} eq "NCP") { #- same for NCP printer my $config_file = "$prefix$queue_path/.config"; @@ -642,8 +644,9 @@ sub configure_queue($) { print F "queue=$entry->{NCPQUEUE}\n"; print F "user=$entry->{NCPUSER}\n"; print F "password=$entry->{NCPPASSWD}\n"; + close F; + eval { chmod 0640, $config_file; commands::chown_("root.lp", $config_file) }; } - eval { chmod 0640, "$prefix$queue_path/.config"; commands::chown_("root.lp", "$prefix$queue_path/.config") }; copy_master_filter($queue_path); |