summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-06 16:13:17 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-06 16:13:17 +0000
commit4e9652a0288bd8bdc07e075b7dc3528a17986b58 (patch)
treed5fe280e140b8086c6025ed7dcb1f41cf2b869e3
parenta38a6ee1740a6fa2e94aab9dc217dc553741d2a4 (diff)
downloaddrakx-4e9652a0288bd8bdc07e075b7dc3528a17986b58.tar
drakx-4e9652a0288bd8bdc07e075b7dc3528a17986b58.tar.gz
drakx-4e9652a0288bd8bdc07e075b7dc3528a17986b58.tar.bz2
drakx-4e9652a0288bd8bdc07e075b7dc3528a17986b58.tar.xz
drakx-4e9652a0288bd8bdc07e075b7dc3528a17986b58.zip
(setPackages) simplify
(needed for next commits)
-rw-r--r--perl-install/install/any.pm27
1 files changed, 14 insertions, 13 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 9333c708c..d349a5eb5 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -312,43 +312,44 @@ sub load_rate_files {
sub setPackages {
my ($o) = @_;
+ my $urpm;
require install::pkgs;
{
#- clean shared regions very early
# (configure_media will open rpmdb for listing existing pubkeys,
# which may fail when rpm version mistmatches between drakx & chrooted env)
install::pkgs::clean_rpmdb_shared_regions();
- $o->{packages} = install::pkgs::empty_packages($o->{keep_unrequested_dependencies});
+ $urpm = $o->{packages} = install::pkgs::empty_packages($o->{keep_unrequested_dependencies});
my $media = $o->{media} || [ { type => 'media_cfg', url => 'drakx://media' } ];
my ($suppl_method, $copy_rpms_on_disk);
{
my @errors;
- local $::o->{packages}{error} = sub {
+ local $urpm->{error} = sub {
log::l("urpmi error: $_[0]");
push @errors, @_;
};
- ($suppl_method, $copy_rpms_on_disk) = install::media::get_media($o, $media, $o->{packages});
+ ($suppl_method, $copy_rpms_on_disk) = install::media::get_media($o, $media, $urpm);
if ($suppl_method) {
1 while $o->selectSupplMedia;
}
- install::media::configure_media($o->{packages});
+ install::media::configure_media($urpm);
if (@errors) {
$::o->ask_warn(undef, N("An error occurred:") . "\n\n" . join("\n", @errors));
}
}
- install::media::adjust_paths_in_urpmi_cfg($o->{packages});
+ install::media::adjust_paths_in_urpmi_cfg($urpm);
log::l('urpmi completely set up');
#- open rpm db according to right mode needed
- $o->{packages}{rpmdb} ||= install::pkgs::rpmDbOpen('rebuild_if_needed');
+ $urpm->{rpmdb} ||= install::pkgs::rpmDbOpen('rebuild_if_needed');
{
my $_wait = $o->wait_message('', N("Looking at packages already installed..."));
- install::pkgs::selectPackagesAlreadyInstalled($o->{packages});
+ install::pkgs::selectPackagesAlreadyInstalled($urpm);
}
remove_package_for_upgrade($o);
@@ -357,15 +358,15 @@ sub setPackages {
#- always try to select basic kernel (else on upgrade, kernel will never be updated provided a kernel is already
#- installed and provides what is necessary).
- my $kernel_pkg = install::pkgs::bestKernelPackage($o->{packages}, $o->{match_all_hardware});
- install::pkgs::selectPackage($o->{packages}, $kernel_pkg, 1);
- if ($o->{isUpgrade} && $o->{packages}{sizes}{dkms} && $kernel_pkg =~ /(.*)-latest/) {
+ my $kernel_pkg = install::pkgs::bestKernelPackage($urpm, $o->{match_all_hardware});
+ install::pkgs::selectPackage($urpm, $kernel_pkg, 1);
+ if ($o->{isUpgrade} && $urpm->{sizes}{dkms} && $kernel_pkg =~ /(.*)-latest/) {
my $devel_kernel_pkg = "$1-devel-latest";
log::l("selecting $devel_kernel_pkg (since dkms was installed)");
- install::pkgs::select_by_package_names($o->{packages}, [ $devel_kernel_pkg ], 1);
+ install::pkgs::select_by_package_names($urpm, [ $devel_kernel_pkg ], 1);
}
- install::pkgs::select_by_package_names_or_die($o->{packages}, ['basesystem'], 1);
+ install::pkgs::select_by_package_names_or_die($urpm, ['basesystem'], 1);
my $rpmsrate_flags_was_chosen = $o->{rpmsrate_flags_chosen};
@@ -382,7 +383,7 @@ sub setPackages {
if ($o->{isUpgrade}) {
my $_w = $o->wait_message('', N("Finding packages to upgrade..."));
- install::pkgs::selectPackagesToUpgrade($o->{packages});
+ install::pkgs::selectPackagesToUpgrade($urpm);
}
}