From d512e5b671300779b9ad738d71160e0562cfc76e Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 19 Aug 2004 11:29:00 +0000
Subject: perl_checker fixes

---
 perl-install/printer/printerdrake.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'perl-install/printer')

diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 84f000b15..044cc0a7d 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2451,7 +2451,7 @@ sub choose_model {
 				  N("Reading printer database..."));
         printer::main::read_printer_db($printer, $printer->{SPOOLER});
     }
-    if (!member($printer->{DBENTRY}, keys(%printer::main::thedb))) {
+    unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
 	$printer->{DBENTRY} = N("Raw printer (No driver)");
     }
     # Choose the printer/driver from the list
@@ -2537,7 +2537,7 @@ sub installppd {
 	    return 0;
 	}
 	# Let user select a PPD file from a floppy, hard disk, ...
-        $ppdfile = $in->ask_file(N("Select PPD file"), "$dir");
+        $ppdfile = $in->ask_file(N("Select PPD file"), $dir);
 	last if !$ppdfile;
 	if (! -r $ppdfile) {
 	    $in->ask_warn(N("Error"),
@@ -3458,11 +3458,13 @@ sub start_network {
     my $_w = $in->wait_message(N("Printerdrake"), 
 			      N("Starting network..."));
     if ($::isInstall) {
-	return ($upNetwork and 
-		do { my $ret = &$upNetwork(); 
-		     undef $upNetwork; 
-		     sleep(1);
-		     $ret });
+	my $ret;
+	if ($upNetwork) {
+            $ret = &$upNetwork();
+            undef $upNetwork;
+            sleep(1);
+        }
+        return $ret;
     } else { return printer::services::start("network") }
 }
 
-- 
cgit v1.2.1