Repair FTP supplementary media with overriding of rpmsrate and compssUsers.pl

1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index aa93633f5..bd255b47d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+Version 16.104 - 13 June 2015
+
 - diskdrake:
   o prevent errors when telling kernel to reread partition table
 
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;
 	    }