diff options
| -rw-r--r-- | perl-install/install2.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 3 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 13 |
4 files changed, 14 insertions, 10 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index ec7d0a666..1f2d8f1b1 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -339,8 +339,10 @@ sub formatPartitions { sub choosePackages { $o->setPackages if $_[1] == 1; $o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1; - $o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $_[1] == 1); - do { $o->{packages}{$_}{selected} = 1 foreach @{$o->{base}} } unless $o->{isUpgrade}; #- already done. + unless ($o->{isUpgrade}) { + $o->choosePackages($o->{packages}, $o->{compss}, $o->{compssUsers}, $_[1] == 1); + $o->{packages}{$_}{selected} = 1 foreach @{$o->{base}}; #- already done by selectPackagesToUpgrade. + } } #------------------------------------------------------------------------------ diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 6e1b8bb1c..2e8effdf4 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -233,7 +233,7 @@ sub searchAndMount4Upgrade { } is_empty_array_ref($found) and die _("No root partition found"); - log::l("Found root partition : $root->{device}"); + log::l("found root partition : $root->{device}"); #- test if the partition has to be fschecked and remounted rw. if ($root->{realMntpoint}) { diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 3d2551009..d31041a32 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -111,7 +111,6 @@ sub detect() { eval { commands::modprobe("serial") }; my $r; $r = mouseconfig(); return $r if $r; - modules::unload("serial"); #- my %l; #- eval { commands::modprobe("serial") }; #- @l{qw(FULLNAME nbuttons MOUSETYPE XMOUSETYPE device)} = split("\n", `mouseconfig --nointeractive 2>/dev/null`) and return \%l; @@ -120,7 +119,7 @@ sub detect() { if (my ($c) = pci_probing::main::probe("SERIAL_USB")) { eval { modules::load($c->[1], 'usbmouse') }; sleep(1); - return name2mouse("USB Mouse") if !$@ && detect_devices::tryOpen("usbmouse"); + do { modules::unload("serial"); return name2mouse("USB Mouse") } if !$@ && detect_devices::tryOpen("usbmouse"); modules::unload($c->[1]); } die "mouseconfig failed"; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 60ccfcf43..f25357a49 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -318,11 +318,13 @@ sub init_db { c::rpmErrorSetCallback(fileno LOG); #- c::rpmSetVeryVerbose(); - log::l("reading /usr/lib/rpm/rpmrc"); - c::rpmReadConfigFiles() or die "can't read rpm config files"; - log::l("\tdone"); +# log::l("reading /usr/lib/rpm/rpmrc"); +# c::rpmReadConfigFiles() or die "can't read rpm config files"; +# log::l("\tdone"); - $isUpgrade ? c::rpmdbRebuild($prefix) : c::rpmdbInit($prefix, 0644) or die "creation/rebuilding of rpm database failed: ", c::rpmErrorString(); + $isUpgrade and c::rpmdbRebuild($prefix) || die "rebuilding of rpm database failed: ", c::rpmErrorString(); + c::rpmdbInit($prefix, 0644) || die "creation of rpm database failed: ", c::rpmErrorString(); +#- $isUpgrade ? c::rpmdbRebuild($prefix) : c::rpmdbInit($prefix, 0644) or die "creation/rebuilding of rpm database failed: ", c::rpmErrorString(); } sub done_db { @@ -447,6 +449,7 @@ sub selectPackagesToUpgrade($$$) { #- close db, job finished ! c::rpmdbClose($db); + log::l("done selecting packages to upgrade"); } sub install($$) { @@ -486,7 +489,7 @@ sub install($$) { eval { fs::mount("/proc", "$prefix/proc", "proc", 0) }; - log::ld("starting installation: ", $nb, " packages, ", $total, " bytes"); + log::l("starting installation: ", $nb, " packages, ", $total, " bytes"); #- !! do not translate these messages, they are used when catched (cf install_steps_gtk) my $callbackOpen = sub { |