diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-05-26 08:17:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-05-26 08:17:27 +0000 |
| commit | 0389f5e245a572f88b4ca3b79e97c496d2537a09 (patch) | |
| tree | 98afb07f442d2a5110f77ca1d542cdcda280db50 /perl-install/modules.pm | |
| parent | 0b3ea64c4e843ea2b83241c196fffdfe255d3f84 (diff) | |
| download | drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar.gz drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar.bz2 drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.tar.xz drakx-0389f5e245a572f88b4ca3b79e97c496d2537a09.zip | |
replace unused $o->{localInstall} with $::local_install, partially used instead of $::uml_install
and used in drakx-in-chroot
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 8f50b78e1..2735d09ea 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -56,7 +56,7 @@ sub cond_mapping_24_26 { # handles dependencies sub load_raw { my ($l, $h_options) = @_; - if ($::testing) { + if ($::testing || $::local_install) { log::l("i would load module $_ ($h_options->{$_})") foreach @$l; } elsif ($::isInstall && !$::move) { load_raw_install($l, $h_options); @@ -287,7 +287,7 @@ sub cz_file() { sub extract_modules { my ($dir, @modules) = @_; my $cz = cz_file(); - if (!-e $cz && !$::uml_install) { + if (!-e $cz && !$::local_install) { unlink $_ foreach glob_("/lib/modules*.cz*"); require install_any; install_any::getAndSaveFile("install/stage2/live$cz", $cz) or die "failed to get modules $cz: $!"; |