summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-09 10:36:17 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-09 10:36:17 +0000
commitaba8a80ef17d4700640268e0e73311367ef23131 (patch)
tree2cb3a185a7bbf9fe6d938195289d681797f1d776
parent6212a13d30cf4109af69dcaec7af84cb574298e9 (diff)
downloaddrakx-aba8a80ef17d4700640268e0e73311367ef23131.tar
drakx-aba8a80ef17d4700640268e0e73311367ef23131.tar.gz
drakx-aba8a80ef17d4700640268e0e73311367ef23131.tar.bz2
drakx-aba8a80ef17d4700640268e0e73311367ef23131.tar.xz
drakx-aba8a80ef17d4700640268e0e73311367ef23131.zip
(install) do not kill runaway processes when building the globetrotter
-rw-r--r--perl-install/pkgs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 43442db40..d9ad942e2 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1200,7 +1200,7 @@ sub install {
difference2([ $$, hashtree2list(getppid(), \%ppids) ],
[ hashtree2list($$, \%ppids) ]) ]);
- if (@killpid && $::isInstall && !$::local_install) {
+ if (@killpid && $::isInstall && !$::local_install && !$::build_globetrotter) {
foreach (@killpid) {
my ($prog, @para) = split("\0", cat_("/proc/$_/cmdline"));
log::l("ERROR: DrakX should not have to clean the packages shit. Killing $_: " . join(' ', $prog, @para) . ".") if $prog ne '/usr/lib/gconfd-2';