From a378443bee2334e130b573c276e7e54be47dc9b4 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 11 Jul 2007 16:57:01 +0000 Subject: - allow using sqlite for rpmdb when using option rpm_dbapi=4 --- perl-install/install/pkgs.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'perl-install/install/pkgs.pm') diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 1d2f82ff3..a5452c3d5 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -548,11 +548,17 @@ sub openInstallLog() { } sub rpmDbOpen { - my ($b_rebuild_needed) = @_; + my ($b_rebuild_needed, $o_rpm_dbapi) = @_; 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"); + } - if ($b_rebuild_needed) { + if ($b_rebuild_needed && !$o_rpm_dbapi) { if (my $pid = fork()) { waitpid $pid, 0; $? & 0xff00 and die "rebuilding of rpm database failed"; -- cgit v1.2.1