diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2003-01-14 23:19:10 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2003-01-14 23:19:10 +0000 |
| commit | 032d70f4b3851500fee1aa303f346d2a22e4d6d4 (patch) | |
| tree | 71acfe815d1d7ad9493b359226b4e272cc1a9255 /perl-install/printer/printerdrake.pm | |
| parent | a812d518a577c05d6e88ed8326a0d71b9d48664e (diff) | |
| download | drakx-backup-do-not-use-032d70f4b3851500fee1aa303f346d2a22e4d6d4.tar drakx-backup-do-not-use-032d70f4b3851500fee1aa303f346d2a22e4d6d4.tar.gz drakx-backup-do-not-use-032d70f4b3851500fee1aa303f346d2a22e4d6d4.tar.bz2 drakx-backup-do-not-use-032d70f4b3851500fee1aa303f346d2a22e4d6d4.tar.xz drakx-backup-do-not-use-032d70f4b3851500fee1aa303f346d2a22e4d6d4.zip | |
Removed bugs from Titi which prevented printerdrake from installing the requested spooler.
Diffstat (limited to 'perl-install/printer/printerdrake.pm')
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 7345d09da..81b570ff3 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -2769,9 +2769,9 @@ sub install_spooler { # Avoid unnecessary restarting of CUPS, this blocks the # startup of printerdrake for several seconds. printer::services::start_not_running_service("cups"); - } elsif ($spoolers{$spooler}{service}) { - printer::services::restart($spoolers{$spooler}{service}); - } + } elsif ($spoolers{$spooler}{service}) { + printer::services::restart($spoolers{$spooler}{service}); + } # Set the choosen spooler tools as defaults for "lpr", "lpq", "lprm", ... foreach (@{$spoolers{$spooler}{alternatives}}) { @@ -2800,9 +2800,9 @@ sub setup_default_spooler { $in->ask_from_list_(N("Select Printer Spooler"), N("Which printing system (spooler) do you want to use?"), [ printer::main::spooler() ], - $spoolers{$printer->{SPOOLER}}, + $spoolers{$printer->{SPOOLER}}{long_name}, ) or return; - $printer->{SPOOLER} = $spoolers{$str_spooler}; + $printer->{SPOOLER} = $spooler_inv{$str_spooler}; # Install the spooler if not done yet if (!install_spooler($printer, $in, $upNetwork)) { $printer->{SPOOLER} = $oldspooler; @@ -2893,7 +2893,7 @@ sub main { } # only experts should be asked for the spooler - $printer->{SPOOLER} ||= 'cups' if $::expert; + $printer->{SPOOLER} ||= 'cups' if !$::expert; } |