summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-06 16:13:21 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-06 16:13:21 +0000
commitfba45b1178d82a0ee495eb39c1bb6bd7232a49d9 (patch)
treeecba6e01e6dc518476609ebf17de5cd58985c44f
parent4e9652a0288bd8bdc07e075b7dc3528a17986b58 (diff)
downloaddrakx-fba45b1178d82a0ee495eb39c1bb6bd7232a49d9.tar
drakx-fba45b1178d82a0ee495eb39c1bb6bd7232a49d9.tar.gz
drakx-fba45b1178d82a0ee495eb39c1bb6bd7232a49d9.tar.bz2
drakx-fba45b1178d82a0ee495eb39c1bb6bd7232a49d9.tar.xz
drakx-fba45b1178d82a0ee495eb39c1bb6bd7232a49d9.zip
(setPackages,configure_media) extract call to urpm::media::configure()
(needed for next commits)
-rw-r--r--perl-install/install/any.pm4
-rw-r--r--perl-install/install/media.pm1
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index d349a5eb5..4871c7c29 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -341,6 +341,10 @@ sub setPackages {
}
}
+ # actually read synthesis now we have all the ones we want:
+ require urpm::media;
+ urpm::media::configure($urpm);
+
install::media::adjust_paths_in_urpmi_cfg($urpm);
log::l('urpmi completely set up');
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index d821ab8e2..659f73136 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -504,7 +504,6 @@ 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 {