summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2013-04-08 22:33:34 +0000
committerOlivier Blin <blino@mageia.org>2013-04-08 22:33:34 +0000
commitd253642ad62d4a5628bad39b52ce843788c75fa0 (patch)
tree574c5914297f7242698a60c13d51ac2a072e6c3c
parentc2914bba107db15ee1086b8c0cf28137324b59d7 (diff)
downloaddrakx-d253642ad62d4a5628bad39b52ce843788c75fa0.tar
drakx-d253642ad62d4a5628bad39b52ce843788c75fa0.tar.gz
drakx-d253642ad62d4a5628bad39b52ce843788c75fa0.tar.bz2
drakx-d253642ad62d4a5628bad39b52ce843788c75fa0.tar.xz
drakx-d253642ad62d4a5628bad39b52ce843788c75fa0.zip
finish-install: configure urpmi media even if local media are configured, and only if online media are not setup (for live)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/finish-install4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9756020f2..b675e04c5 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- finish-install: configure urpmi media even if local media are
+ configured, and only if online media are not setup (for live)
- diskdrake:
o allow to choose btrfs in normal mode (mga#65)
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 57298ebf7..8682a9a5f 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -119,7 +119,9 @@ sub ask_network() {
sub ask_urpmi() {
#- configure urpmi media if no media are configured
- run_program::get_stdout('urpmq', '--list-media') and return;
+ my @media_url = map { top(split(' ', $_)) } run_program::get_stdout('urpmq', '--list-url');
+ my @online_media = grep { !m,^(?:file://)?/, } @media_url;
+ @online_media and return;
any::urpmi_add_all_media($in);
}