summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-17 02:52:00 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-17 02:52:00 +0000
commit9e0a01e8126a895fdc91433494b97d6add4f2b8c (patch)
treef6da02828b2041f867d4f7cf74affb36cc522150
parent112b63ff2ae8aa442a641ab4f3cd5b3d111d5329 (diff)
downloaddrakx-9e0a01e8126a895fdc91433494b97d6add4f2b8c.tar
drakx-9e0a01e8126a895fdc91433494b97d6add4f2b8c.tar.gz
drakx-9e0a01e8126a895fdc91433494b97d6add4f2b8c.tar.bz2
drakx-9e0a01e8126a895fdc91433494b97d6add4f2b8c.tar.xz
drakx-9e0a01e8126a895fdc91433494b97d6add4f2b8c.zip
Supplementary cd-roms don't need to have a rpmsrate / compssUsers.pl
-rw-r--r--perl-install/install_any.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 7de75d3f8..b6b522bc6 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -489,15 +489,18 @@ sub setPackages {
pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
#- must be done after getProvides
- #- if there is a supplementary CD, override the rpmsrate/compssUsers
- #- FIXME make this overriding optional
+ #- if there is a supplementary CD, the rpmsrate/compssUsers are overridable
pkgs::read_rpmsrate(
$o->{packages},
- getFile($suppl_method eq 'cdrom' ? "/mnt/cdrom/media/media_info/rpmsrate" : "media/media_info/rpmsrate")
+ getFile(
+ $suppl_method eq 'cdrom' && -e "/mnt/cdrom/media/media_info/rpmsrate"
+ ? "/mnt/cdrom/media/media_info/rpmsrate"
+ : "media/media_info/rpmsrate")
);
($o->{compssUsers}, $o->{gtk_display_compssUsers}) = pkgs::readCompssUsers(
$o->{meta_class},
- ($suppl_method eq 'cdrom' ? '/mnt/cdrom/' : '') . 'media/media_info/compssUsers.pl'
+ ($suppl_method eq 'cdrom' && -e '/mnt/cdrom/media/media_info/compssUsers.pl' ? '/mnt/cdrom/' : '')
+ . 'media/media_info/compssUsers.pl'
);
#- preselect default_packages and compssUsers selected.