diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-06 08:04:20 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-06 08:04:20 +0000 |
| commit | 866c6abb0bd3eb803e9111b510afd62b23fa790f (patch) | |
| tree | 19fea43dc05f58f0083814123896bb752f6e99d3 | |
| parent | b46d65c242162f9675aadefe532bb9f66b7e84ef (diff) | |
| download | drakx-866c6abb0bd3eb803e9111b510afd62b23fa790f.tar drakx-866c6abb0bd3eb803e9111b510afd62b23fa790f.tar.gz drakx-866c6abb0bd3eb803e9111b510afd62b23fa790f.tar.bz2 drakx-866c6abb0bd3eb803e9111b510afd62b23fa790f.tar.xz drakx-866c6abb0bd3eb803e9111b510afd62b23fa790f.zip | |
Override rpmsrate and compssUsers.pl by the ones found on a
supplementary CD
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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. |