summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-03 17:10:53 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-03 17:10:53 +0000
commit12d352708ab3877a8fc027cefa1c284cf511d6d7 (patch)
treeb81e4c01a5974d9fccad53207ba01a11754eb323
parent068965767bfc13889cf0f3caed9c2ba6c3b36f1a (diff)
downloaddrakx-12d352708ab3877a8fc027cefa1c284cf511d6d7.tar
drakx-12d352708ab3877a8fc027cefa1c284cf511d6d7.tar.gz
drakx-12d352708ab3877a8fc027cefa1c284cf511d6d7.tar.bz2
drakx-12d352708ab3877a8fc027cefa1c284cf511d6d7.tar.xz
drakx-12d352708ab3877a8fc027cefa1c284cf511d6d7.zip
(install) drop file handle management code from open callback (now done by urpmi)
-rw-r--r--perl-install/install/pkgs.pm5
1 files changed, 0 insertions, 5 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index b0767211d..9387cab99 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -728,7 +728,6 @@ sub _install_raw {
my ($retry, $retry_count);
log::l("rpm transactions start");
- my $fd; #- since we return the "fileno", perl does not know we're still using it, and so closes it, and :-(
my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, undef, {
open_unused => sub {
@@ -736,11 +735,7 @@ sub _install_raw {
&$callback;
my $pkg = defined $id && $packages->{depslist}[$id];
my $medium = packageMedium($packages, $pkg);
- my $f = $pkg && install::media::rel_rpm_file($medium, $pkg->filename);
print $LOG "$f\n";
- undef $fd;
- $fd = getFile_($medium->{phys_medium}, $f);
- $fd ? fileno $fd : -1;
}, close_unused => sub {
my ($packages, $_type, $id) = @_;
&$callback;