From cc1544f519cec27e9872bc04077b0dd0161b6845 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Sun, 12 Aug 2001 21:41:27 +0000
Subject: Check files before checking RPM database => Acceleration, waiting
 windows

---
 perl-install/printer.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'perl-install/printer.pm')

diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index a592dbcb8..9ed8dbb90 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -110,6 +110,14 @@ sub stop_service ($) {
 	|| die "Could not stop $service!";
 }
 
+sub files_exist {
+    my @files = @_;
+    for (@files) {
+	if (! -f "$prefix$_") {return 0;}
+    }
+    return 1;
+}
+
 sub copy_printer_params($$) {
     my ($from, $to) = @_;
     map { $to->{$_} = $from->{$_} } grep { $_ ne 'configured' } keys %$from; 
@@ -750,7 +758,7 @@ sub print_pages($@) {
 	# images must be treated seperately
 	if ($page =~ /\.jpg$/) {
 	    system(($::testing ? "$prefix" : "chroot $prefix/ ") .
-		"convert $page -page 427x654+100+65 PS:- | " .
+		   "/usr/bin/convert $page -page 427x654+100+65 PS:- | " .
 		   "$lpr -s $printer->{SPOOLER} -P $queue");
 	} else {
 	    run_program::rooted($prefix, $lpr, "-s", $printer->{SPOOLER},
-- 
cgit v1.2.1