summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-08 11:54:18 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-08 11:54:18 +0000
commitd9cff2800af0b7cde4a7e94cbc97be58fe164b3c (patch)
treed236476fc70abf2d57a199c7b9d90ae12c109508
parent29702612d5813da9a05a2fca1fef3ea66d94c6b2 (diff)
downloaddrakx-d9cff2800af0b7cde4a7e94cbc97be58fe164b3c.tar
drakx-d9cff2800af0b7cde4a7e94cbc97be58fe164b3c.tar.gz
drakx-d9cff2800af0b7cde4a7e94cbc97be58fe164b3c.tar.bz2
drakx-d9cff2800af0b7cde4a7e94cbc97be58fe164b3c.tar.xz
drakx-d9cff2800af0b7cde4a7e94cbc97be58fe164b3c.zip
(install::media::configure_media) extract it out of install::any::SetPackages
(needed for next commit)
-rw-r--r--perl-install/install/any.pm4
-rw-r--r--perl-install/install/media.pm7
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index bb2ddfcf5..b683c0995 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -321,10 +321,8 @@ sub setPackages {
1 while $o->selectSupplMedia;
}
- urpm::media::update_media($o->{packages}, distrib => 1, callback => \&urpm::download::sync_logger) or
- log::l('updating media failed');
+ install::media::configure_media($o->{packages});
install::media::adjust_paths_in_urpmi_cfg($o->{packages});
- urpm::media::configure($o->{packages});
log::l('urpmi completely set up');
#- open rpm db according to right mode needed
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 54ae9001b..082bb4457 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -491,6 +491,13 @@ sub select_only_some_media {
}
}
+sub configure_media {
+ my ($packages) = @_;
+ urpm::media::update_media($packages, distrib => 1, callback => \&urpm::download::sync_logger) or
+ log::l('updating media failed');
+ urpm::media::configure($packages);
+}
+
sub get_media {
my ($o, $media, $packages) = @_;
use Data::Dumper;