diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2003-02-20 02:47:07 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2003-02-20 02:47:07 +0000 |
| commit | b38b4b7bf51ee1bcbc2dcae962d296f27ca1515f (patch) | |
| tree | 04739b0b779a5f172b327f0ace76d103ba4fdbd6 /perl-install/printer/printerdrake.pm | |
| parent | 4e34f1b29ba772add6a0df5273ad0450fed1a5ab (diff) | |
| download | drakx-b38b4b7bf51ee1bcbc2dcae962d296f27ca1515f.tar drakx-b38b4b7bf51ee1bcbc2dcae962d296f27ca1515f.tar.gz drakx-b38b4b7bf51ee1bcbc2dcae962d296f27ca1515f.tar.bz2 drakx-b38b4b7bf51ee1bcbc2dcae962d296f27ca1515f.tar.xz drakx-b38b4b7bf51ee1bcbc2dcae962d296f27ca1515f.zip | |
- Improved/fixed generation of printer list entries from
manufacturer-supplied PostScript PPD files
- Removed forgotten debug mode
- Disabled wizard-mode temporarily
Diffstat (limited to 'perl-install/printer/printerdrake.pm')
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 0913bde7f..6f9d48612 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -1961,8 +1961,7 @@ sub setup_common { my $matched = 1; my ($mfg, $mdl, $des); if ($mfg = $printer::main::thedb{$entry}{devidmake}) { - $mfg =~ s/Hewlett[-\s_]Packard/HP/; - $mfg =~ s/HEWLETT[-\s_]PACKARD/HP/; + $mfg =~ s/Hewlett[-\s_]Packard/HP/i; if (uc($mfg) ne uc($automake)) { $matched = 0; } @@ -3709,7 +3708,7 @@ sub main { #- Do all the configuration steps for a new queue step_0: #if ((!$::expert) && (!$::isEmbedded) && (!$::isInstall) && - if (!$::isEmbedded && !$::isInstall && + if (0 && !$::isEmbedded && !$::isInstall && #if ((!$::isInstall) && $in->isa('interactive::gtk')) { # Enter wizard mode @@ -3724,8 +3723,8 @@ sub main { next; }; undef $::Wizard_no_previous; - #eval { - do { + eval { + #do { # eval to catch wizard cancel. The wizard stuff should # be in a separate function with steps. see dragw. # (dams) |