summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-09 10:35:58 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-09 10:35:58 +0000
commitd37030cd529b9fccfb370587c8b3e1d959ba929c (patch)
treef44811a3195d520ed08b5390a5b893669e3c514f
parentc293a6a31f59e6f51b01d194527d2531321b75d3 (diff)
downloaddrakx-d37030cd529b9fccfb370587c8b3e1d959ba929c.tar
drakx-d37030cd529b9fccfb370587c8b3e1d959ba929c.tar.gz
drakx-d37030cd529b9fccfb370587c8b3e1d959ba929c.tar.bz2
drakx-d37030cd529b9fccfb370587c8b3e1d959ba929c.tar.xz
drakx-d37030cd529b9fccfb370587c8b3e1d959ba929c.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 00ca933d9..33e497995 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1222,7 +1222,7 @@ sub install {
difference2([ $$, hashtree2list(getppid(), \%ppids) ],
[ hashtree2list($$, \%ppids) ]) ]);
- if (@killpid && $::isInstall) {
+ if (@killpid && $::isInstall && !$::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';