From b29b116f7d3f32a14257a4a55169d8ce11d71267 Mon Sep 17 00:00:00 2001
From: Marcelo Leitner <mrl@mandriva.com>
Date: Wed, 20 Feb 2008 18:51:23 +0000
Subject: - Block two too dangerous pkill commands. - Enhance logging for
 another pkill command.

---
 lib/Iurt/Process.pm |  1 +
 lib/Iurt/Urpmi.pm   | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/Iurt/Process.pm b/lib/Iurt/Process.pm
index a15bbc4..9a9128f 100644
--- a/lib/Iurt/Process.pm
+++ b/lib/Iurt/Process.pm
@@ -315,6 +315,7 @@ sub clean {
     my $i;
 
     while ($ps = `$cmd "$var"`) {
+	plog('WARN', "Killing: $kill_cmd $var");
 	system(qq($kill_cmd "$var" &>/dev/null));
 	sleep 1;
 	$ps =~ s/\n/,/g;
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index 5d8fadc..99442dc 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -246,9 +246,10 @@ sub add_packages {
 		        sleep 30; 
 		        $self->{wait_limit}++; 
 		        if ($self->{wait_limit} > 10) { 
-		    	    $self->{wait_limit} = 0;
-			    system(qq(sudo pkill -9 urpmi &>/dev/null));
-			    return;
+			    #$self->{wait_limit} = 0;
+			    # <mrl> We can't shoot such command, it's too powerfull.
+			    #system(qq(sudo pkill -9 urpmi &>/dev/null));
+			    return 0;
 			} 
 			1;
 		  } },)) {
@@ -373,8 +374,11 @@ sub wait_urpmi {
     plog("WARNING: urpmi database locked, waiting...") if $run->{debug};
     sleep 30; 
     $self->{wait_limit}++; 
-    if ($self->{wait_limit} > 8) { 
-	$self->{wait_limit} = 0; system(qq(sudo pkill -9 urpmi &>/dev/null));
+    if ($self->{wait_limit} > 8) {
+	#$self->{wait_limit} = 0;
+	# <mrl> We can't shoot such command, it's too powerfull.
+	#system(qq(sudo pkill -9 urpmi &>/dev/null));
+	return 0;
     } 
 }
 
-- 
cgit v1.2.1