summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-14 14:05:04 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-14 14:05:04 +0000
commit0a5e281ec0a4bfc3e3c3e907b7cdc90f24ec8161 (patch)
tree178f7d397b7d9604c2c6a7040b106edee0c703ea
parent09cb9549757c45fd488a8b9cfc038b12402eb042 (diff)
downloaddrakx-0a5e281ec0a4bfc3e3c3e907b7cdc90f24ec8161.tar
drakx-0a5e281ec0a4bfc3e3c3e907b7cdc90f24ec8161.tar.gz
drakx-0a5e281ec0a4bfc3e3c3e907b7cdc90f24ec8161.tar.bz2
drakx-0a5e281ec0a4bfc3e3c3e907b7cdc90f24ec8161.tar.xz
drakx-0a5e281ec0a4bfc3e3c3e907b7cdc90f24ec8161.zip
show which media are actually disabled when offering to add supplementary ones
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/any.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3e2c10dc1..6c0f234e0 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- media step:
+ o show which media are disabled when offering to pick supplementary ones
+
Version 15.11 - 13 December 2012
- install grub2 if needed
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 862696baf..4d6f240ff 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -114,7 +114,7 @@ sub ask_suppl_media_method {
Do you have a supplementary installation medium to configure?",
- "\n\n\n" . join(",\n\n", map { "- $_->{name}" } install::media::allMediums($o->{packages}))));
+ "\n\n\n" . join(",\n\n", map { "- $_->{name}" . ($_->{ignore} ? " (disabled)" : '') } install::media::allMediums($o->{packages}))));
my %l = my @l = (
'' => N("None"),