From 866c6abb0bd3eb803e9111b510afd62b23fa790f Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Mon, 6 Sep 2004 08:04:20 +0000 Subject: Override rpmsrate and compssUsers.pl by the ones found on a supplementary CD --- perl-install/install_any.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/install_any.pm') diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 0287ea23c..ae52df299 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -538,14 +538,14 @@ sub setPackages { pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1); #- must be done after getProvides - #- if there is a supplementary CD, the rpmsrate/compssUsers are overridable + #- if there is a supplementary media, the rpmsrate/compssUsers are overridable pkgs::read_rpmsrate( $o->{packages}, - getFile($suppl_method eq 'cdrom' && -e "/tmp/rpmsrate" ? "/tmp/rpmsrate" : "media/media_info/rpmsrate") + getFile(-e "/tmp/rpmsrate" ? "/tmp/rpmsrate" : "media/media_info/rpmsrate") ); ($o->{compssUsers}, $o->{gtk_display_compssUsers}) = pkgs::readCompssUsers( $o->{meta_class}, - $suppl_method eq 'cdrom' && -e '/tmp/compssUsers.pl' ? '/tmp/compssUsers.pl' : 'media/media_info/compssUsers.pl' + -e '/tmp/compssUsers.pl' ? '/tmp/compssUsers.pl' : 'media/media_info/compssUsers.pl' ); #- preselect default_packages and compssUsers selected. -- cgit v1.2.1