summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-10 14:07:01 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-10 14:07:01 +0000
commit776ef82d5407cd1ba6e3b1ba52e81a0c6472dd2f (patch)
treeedafbb5f608e750e45ad60a99ca846b6a3d382dc
parent86923e25769200fc73586e574c3580a646294ede (diff)
downloaddrakx-776ef82d5407cd1ba6e3b1ba52e81a0c6472dd2f.tar
drakx-776ef82d5407cd1ba6e3b1ba52e81a0c6472dd2f.tar.gz
drakx-776ef82d5407cd1ba6e3b1ba52e81a0c6472dd2f.tar.bz2
drakx-776ef82d5407cd1ba6e3b1ba52e81a0c6472dd2f.tar.xz
drakx-776ef82d5407cd1ba6e3b1ba52e81a0c6472dd2f.zip
(media_screen) no media is a critical error
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e5170b237..b5e16c744 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- media choice step:
o blacklist unwanted media instead of whitelisting wanted ones
(fix dual cd where media names are not the regular ones)
+ o no media is a critical error
Version 15.6 - 10 December 2012
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 29fd8e1de..069ed5583 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -421,6 +421,7 @@ sub setPackages {
media_screen($o) if !$::auto_install;
my @choosen_media = map { $_->{name} } grep { !$_->{ignore} } @{$urpm->{media}};
log::l("choosen media: ", join(',', @choosen_media));
+ die "no choosen media" if !@choosen_media;
# actually read synthesis now we have all the ones we want:
require urpm::media;