diff options
| -rw-r--r-- | perl-install/install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 10 |
3 files changed, 3 insertions, 10 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 9aef4699e..a183312e6 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -322,7 +322,7 @@ sub setPackages { } #- open rpm db according to right mode needed - $o->{packages}{rpmdb} ||= install::pkgs::rpmDbOpen('rebuild_if_needed', $o->{rpm_dbapi}); + $o->{packages}{rpmdb} ||= install::pkgs::rpmDbOpen('rebuild_if_needed'); { my $_wait = $o->wait_message('', N("Looking at packages already installed...")); diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index be64e04cb..945bb5267 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -371,7 +371,6 @@ sub main { useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 }, alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 }, fdisk => sub { $o->{partitioning}{fdisk} = 1 }, - rpm_dbapi => sub { $o->{rpm_dbapi} = $v }, nomouseprobe => sub { $o->{nomouseprobe} = $v }, updatemodules => sub { $o->{updatemodules} = 1 }, suppl => sub { $o->{supplmedia} = $v }, diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index f5b8de340..d3f5267ce 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -546,19 +546,13 @@ sub openInstallLog() { } sub rpmDbOpen { - my ($b_rebuild_if_needed, $o_rpm_dbapi) = @_; + my ($b_rebuild_if_needed) = @_; clean_rpmdb_shared_regions(); - - if (my $wanted_dbapi = $o_rpm_dbapi) { - log::l("setting %_dbapi to $wanted_dbapi"); - substInFile { s/%_dbapi.*//; $_ .= "%_dbapi $wanted_dbapi\n" if eof } "$::prefix/etc/rpm/macros"; - URPM::add_macro("_dbapi $wanted_dbapi"); - } my $need_rebuild = $b_rebuild_if_needed && !URPM::DB::verify($::prefix); - if ($need_rebuild && !$o_rpm_dbapi) { + if ($need_rebuild) { if (my $pid = fork()) { waitpid $pid, 0; $? & 0xff00 and die "rebuilding of rpm database failed"; |