From f0478464cd7233e8b103a3a0625fbf381f5ab405 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 25 Jul 2002 19:14:33 +0000
Subject: merge timeout and cancel cases

---
 perl-install/standalone/service_harddrake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index d66b6fc43..8d84ba973 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -76,9 +76,7 @@ foreach (@harddrake::data::tree) {
 	alarm (0);
     };
 
-    next unless ($@);     # timed out
-    print "CANCELED\n" if $res;
-    next unless ($res);   # canceled
+    next unless ($@ && $res);     # timed out || canceled
     if (my $pid = fork) {
 		require POSIX;
 		  POSIX::wait();
-- 
cgit v1.2.1