From b89e73e5eeaa5b278be7e3795ce42deb9dc7eead Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 14 Sep 2018 16:10:41 +0200 Subject: really fix bogus macro expanding rationale: since the following upstream rpm commit: https://github.com/rpm-software-management/rpm/commit/ca36c2a12bcde1340da0421a788863f83aaccd08 rpm doesn't honor/recognize %__dbi_cdb We now have to alter directly %__dbi_other --- perl-install/install/pkgs.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 3317f0fbe..57a7f162f 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -798,7 +798,7 @@ sub install { URPM::read_config_files(); # force loading libnss* getgrent(); - URPM::add_macro(join(' ', '__dbi_cdb', URPM::expand('%__dbi_cdb'), 'nofsync')); + URPM::add_macro(join(' ', '__dbi_other', URPM::expand('%__dbi_other'), 'nofsync')); my $LOG = _openInstallLog(); $packages->{log} = $packages->{info} = $packages->{print} = sub { @@ -1063,7 +1063,7 @@ sub _remove_raw { log::l("removing: " . join(' ', @$to_remove)); URPM::read_config_files(); - URPM::add_macro(URPM::expand('__dbi_cdb %__dbi_cdb nofsync')); + URPM::add_macro(URPM::expand('__dbi_other %__dbi_other nofsync')); my $db = open_rpm_db_rw() or die "error opening RPM database: ", URPM::rpmErrorString(); my $trans = $db->create_transaction; -- cgit v1.2.1