From 89a0b8ea361cfbb76ab7134bbde229ddc26aa385 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Thu, 20 Oct 2005 14:05:54 +0000
Subject: - Updated printerdrake to the state of Mandriva 2006:    o HPLIP
 support    o Gutenprint support    o support for several other new drivers   
 o Printer communication error handling    o Main window of printerdrake comes
 up faster    o Many bug fixes and detail improvements

---
 perl-install/printer/services.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/perl-install/printer/services.pm b/perl-install/printer/services.pm
index adb2587fe..f94cc5af5 100644
--- a/perl-install/printer/services.pm
+++ b/perl-install/printer/services.pm
@@ -45,7 +45,9 @@ sub wait_for_cups() {
     my $cupsready = 0;
     my $i;
     for ($i = 0; $i < 30; $i++) {
-	run_program::rooted($::prefix, "/usr/bin/lpstat", "-r");
+	# Check whether CUPS is running without any console output
+	system(($::testing ? $::prefix : "chroot $::prefix/ ") . 
+	    "/usr/bin/lpstat -r >/dev/null 2>&1");
 	if (($? >> 8) != 0) {
 	    # CUPS is not ready, continue
 	    sleep 1;
-- 
cgit v1.2.1