summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-06 16:19:02 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-06 16:19:02 +0000
commited09a7b52b7b7e341be4569000fb3cf5e8c90690 (patch)
tree825c9fd363d54f20a099fb6fdcbf2b3ad6ad5eed
parent304252fcfff48cda3d87883fadc19e3273291da2 (diff)
downloaddrakx-ed09a7b52b7b7e341be4569000fb3cf5e8c90690.tar
drakx-ed09a7b52b7b7e341be4569000fb3cf5e8c90690.tar.gz
drakx-ed09a7b52b7b7e341be4569000fb3cf5e8c90690.tar.bz2
drakx-ed09a7b52b7b7e341be4569000fb3cf5e8c90690.tar.xz
drakx-ed09a7b52b7b7e341be4569000fb3cf5e8c90690.zip
(setPackages) write urpmi config here instead as in get_media_cfg()
(which is not enough for standalone media)
-rw-r--r--perl-install/install/any.pm5
-rw-r--r--perl-install/install/media.pm5
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 23bd12df3..2698317e6 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -321,6 +321,11 @@ 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');
+ urpm::media::configure($o->{packages});
+ log::l('urpmi completely set up');
+
#- open rpm db according to right mode needed
$o->{packages}{rpmdb} ||= install::pkgs::rpmDbOpen('rebuild_if_needed');
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index fd23b8b4a..2b9719357 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -668,11 +668,6 @@ sub get_media_cfg {
}
_associate_phys_media($o->{all_hds}, $phys_medium, $packages->{media});
-
- urpm::media::update_media($packages, distrib => 1, callback => \&urpm::download::sync_logger) or
- log::l('updating media failed');
- urpm::media::configure($packages);
- log::l('urpmi completely set up');
log::l("get_media_cfg read " . int(@{$packages->{depslist}}) . " headers");