From b38b4b7bf51ee1bcbc2dcae962d296f27ca1515f Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Thu, 20 Feb 2003 02:47:07 +0000 Subject: - Improved/fixed generation of printer list entries from manufacturer-supplied PostScript PPD files - Removed forgotten debug mode - Disabled wizard-mode temporarily --- perl-install/printer/printerdrake.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'perl-install/printer/printerdrake.pm') 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) -- cgit v1.2.1