diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-03 06:27:32 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-03 06:27:32 +0000 |
| commit | d29bd078f783a8a6d8b057f1748a0a9d30e24eea (patch) | |
| tree | 7cfb30a0d51a7e2a47cd73ceee514351e3dc2902 /perl-install | |
| parent | 3237592af5967731e85294ff611ad2c62d58a222 (diff) | |
| download | drakx-d29bd078f783a8a6d8b057f1748a0a9d30e24eea.tar drakx-d29bd078f783a8a6d8b057f1748a0a9d30e24eea.tar.gz drakx-d29bd078f783a8a6d8b057f1748a0a9d30e24eea.tar.bz2 drakx-d29bd078f783a8a6d8b057f1748a0a9d30e24eea.tar.xz drakx-d29bd078f783a8a6d8b057f1748a0a9d30e24eea.zip | |
Make local copies of rpmsrate and compssUsers.pl from supplementary CD
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_any.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 0585303c8..5dc28a9a4 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -441,6 +441,9 @@ sub selectSupplMedia { #- probe for an hdlists file and then look for all hdlists listed herein eval { pkgs::psUsingHdlists($o, $suppl_method, "/mnt/cdrom/media/media_info/hdlists", $o->{packages}, '1s') }; log::l("psUsingHdlists failed: $@"); + #- copy latest compssUsers.pl and rpmsrate somewhere locally + getAndSaveFile("/mnt/cdrom/media/media_info/compssUsers.pl", "/tmp/compssUsers.pl"); + getAndSaveFile("/mnt/cdrom/media/media_info/rpmsrate", "/tmp/rpmsrate"); } } else { my $url = $o->ask_from_entry('', N("URL of the mirror?")) or return ''; @@ -519,15 +522,11 @@ sub setPackages { #- if there is a supplementary CD, the rpmsrate/compssUsers are overridable pkgs::read_rpmsrate( $o->{packages}, - getFile( - $suppl_method eq 'cdrom' && -e "/mnt/cdrom/media/media_info/rpmsrate" - ? "/mnt/cdrom/media/media_info/rpmsrate" - : "media/media_info/rpmsrate") + getFile($suppl_method eq 'cdrom' && -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 '/mnt/cdrom/media/media_info/compssUsers.pl' ? '/mnt/cdrom/' : '') - . 'media/media_info/compssUsers.pl' + $suppl_method eq 'cdrom' && -e '/tmp/compssUsers.pl' ? '/tmp/compssUsers.pl' : 'media/media_info/compssUsers.pl' ); #- preselect default_packages and compssUsers selected. |