summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-07-24 10:23:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-07-24 10:23:21 +0000
commit7e5672eb837597a08dc886dc022f704be9b97665 (patch)
tree51aba798e9eb6501aa32cc1cfdbf4d759a031b3b /perl-install/install_any.pm
parent5d8a5663900537c6695f08692920d666f5ec9213 (diff)
downloaddrakx-7e5672eb837597a08dc886dc022f704be9b97665.tar
drakx-7e5672eb837597a08dc886dc022f704be9b97665.tar.gz
drakx-7e5672eb837597a08dc886dc022f704be9b97665.tar.bz2
drakx-7e5672eb837597a08dc886dc022f704be9b97665.tar.xz
drakx-7e5672eb837597a08dc886dc022f704be9b97665.zip
generalize the use of chomp_ as the functional alternative to chomp (and works on lists)
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
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;