summaryrefslogtreecommitdiffstats
path: root/perl-install/install/pkgs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-12-16 15:27:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-12-16 15:27:49 +0000
commitc603990c6039c2c7b22ab5d6ece9068dd1c36f2d (patch)
treee2d195ef489bbf11e8b57dae1998cc4ce6fca75d /perl-install/install/pkgs.pm
parent9546bc08d6a6a20c5189e686d10c07062d6cd635 (diff)
downloaddrakx-c603990c6039c2c7b22ab5d6ece9068dd1c36f2d.tar
drakx-c603990c6039c2c7b22ab5d6ece9068dd1c36f2d.tar.gz
drakx-c603990c6039c2c7b22ab5d6ece9068dd1c36f2d.tar.bz2
drakx-c603990c6039c2c7b22ab5d6ece9068dd1c36f2d.tar.xz
drakx-c603990c6039c2c7b22ab5d6ece9068dd1c36f2d.zip
cleanup: remove support from migrating to a different rpm dbapi
(it never worked and it was never used)
Diffstat (limited to 'perl-install/install/pkgs.pm')
-rw-r--r--perl-install/install/pkgs.pm10
1 files changed, 2 insertions, 8 deletions
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";