From 7e5672eb837597a08dc886dc022f704be9b97665 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 24 Jul 2001 10:23:21 +0000
Subject: generalize the use of chomp_ as the functional alternative to chomp
 (and works on lists)

---
 perl-install/install_any.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a8eb54f50..979216b8f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -454,7 +454,7 @@ sub setAuthentication {
 }
 
 sub killCardServices {
-    my $pid = chop_(cat_("/tmp/cardmgr.pid"));
+    my $pid = chomp_(cat_("/tmp/cardmgr.pid"));
     $pid and kill(15, $pid); #- send SIGTERM
 }
 
@@ -521,7 +521,7 @@ sub install_urpmi {
 		      cdrom => "removable_cdrom_$::i://mnt/cdrom" }}{$method} . "/$_->{rpmsdir}";
 
 	local *FILES; open FILES, "$ENV{LD_LOADER} parsehdlist /tmp/$_->{hdlist} |";
-	chop, print LIST "$dir/$_\n" foreach <FILES>;
+	print LIST "$dir/$_\n" foreach chomp_(<FILES>);
 	close FILES or log::l("parsehdlist failed"), return;
 	close LIST;
 
-- 
cgit v1.2.1