summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-19 16:23:37 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-19 16:23:37 +0000
commit42e5f09e742d3e9538df00d697194f9f9c52c86b (patch)
tree598263d01fab5aeceac1b9d43f7bd77c0ed800e7
parent7dd1f94c99a1f049023e60a012277b24ce7793f7 (diff)
downloaddrakx-42e5f09e742d3e9538df00d697194f9f9c52c86b.tar
drakx-42e5f09e742d3e9538df00d697194f9f9c52c86b.tar.gz
drakx-42e5f09e742d3e9538df00d697194f9f9c52c86b.tar.bz2
drakx-42e5f09e742d3e9538df00d697194f9f9c52c86b.tar.xz
drakx-42e5f09e742d3e9538df00d697194f9f9c52c86b.zip
Repair FTP supplementary media with overriding of rpmsrate and compssUsers.pl
-rw-r--r--perl-install/install_any.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 33800b4b3..0b23d8a99 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -515,8 +515,13 @@ sub selectSupplMedia {
log::l("psUsingHdlists failed: $@");
} else {
#- copy latest compssUsers.pl and rpmsrate somewhere locally
- getAndSaveFile("$url/media/media_info/compssUsers.pl", "/tmp/compssUsers.pl");
- getAndSaveFile("$url/media/media_info/rpmsrate", "/tmp/rpmsrate");
+ if ($suppl_method eq 'ftp') {
+ getAndSaveFile("media/media_info/compssUsers.pl", "/tmp/compssUsers.pl");
+ getAndSaveFile("media/media_info/rpmsrate", "/tmp/rpmsrate");
+ } else {
+ getAndSaveFile("$url/media/media_info/compssUsers.pl", "/tmp/compssUsers.pl");
+ getAndSaveFile("$url/media/media_info/rpmsrate", "/tmp/rpmsrate");
+ }
useMedium($prev_asked_medium); #- back to main medium
return $suppl_method;
}