summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-25 19:14:33 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-25 19:14:33 +0000
commitf0478464cd7233e8b103a3a0625fbf381f5ab405 (patch)
treec74c5076d87c305132a97094b9cf7728ff26fe50
parent7fd927d471d7c9c1f8834449fd5a8632df019bc9 (diff)
downloaddrakx-f0478464cd7233e8b103a3a0625fbf381f5ab405.tar
drakx-f0478464cd7233e8b103a3a0625fbf381f5ab405.tar.gz
drakx-f0478464cd7233e8b103a3a0625fbf381f5ab405.tar.bz2
drakx-f0478464cd7233e8b103a3a0625fbf381f5ab405.tar.xz
drakx-f0478464cd7233e8b103a3a0625fbf381f5ab405.zip
merge timeout and cancel cases
-rwxr-xr-xperl-install/standalone/service_harddrake4
1 files changed, 1 insertions, 3 deletions
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();