From a21ee6953348cc3a958673c5378c7c41fd7abda6 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Thu, 14 Apr 2005 16:59:28 +0000 Subject: When re-using the rpmsrate and compssUsers.pl from a supplementary media, always retrieve them locally in /tmp, instead of choosing the main install method (this wasn't working for http installs) --- perl-install/install_any.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'perl-install/install_any.pm') diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index f4aee9518..f37d7006e 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -239,6 +239,13 @@ sub getFile { } } || errorOpeningFile($f); } + +sub getLocalFile { + my ($file) = @_; + my $F; + open($F, $file) ? $F : do { log::l("Can not open $file: $!"); undef }; +} + sub getAndSaveFile { my ($file, $local) = @_ == 1 ? ("install/stage2/live$_[0]", $_[0]) : @_; local $/ = \ (16 * 1024); @@ -603,7 +610,7 @@ sub load_rate_files { pkgs::read_rpmsrate( $o->{packages}, $o->{rpmsrate_flags_chosen}, - getFile(-e "/tmp/rpmsrate" ? "/tmp/rpmsrate" : "media/media_info/rpmsrate") + -e "/tmp/rpmsrate" ? getLocalFile("/tmp/rpmsrate") : getFile("media/media_info/rpmsrate") ); ($o->{compssUsers}, $o->{gtk_display_compssUsers}) = pkgs::readCompssUsers( -e '/tmp/compssUsers.pl' ? '/tmp/compssUsers.pl' : 'media/media_info/compssUsers.pl' -- cgit v1.2.1