summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2018-09-14 16:10:41 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2018-09-14 16:20:34 +0200
commitb89e73e5eeaa5b278be7e3795ce42deb9dc7eead (patch)
treefbd3843595a9414b0ed7f7269148f3ec75205a70 /perl-install
parent5abcb05eb0cb7c00096162ac60dc1c5cbf956ad3 (diff)
downloaddrakx-b89e73e5eeaa5b278be7e3795ce42deb9dc7eead.tar
drakx-b89e73e5eeaa5b278be7e3795ce42deb9dc7eead.tar.gz
drakx-b89e73e5eeaa5b278be7e3795ce42deb9dc7eead.tar.bz2
drakx-b89e73e5eeaa5b278be7e3795ce42deb9dc7eead.tar.xz
drakx-b89e73e5eeaa5b278be7e3795ce42deb9dc7eead.zip
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
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/pkgs.pm4
1 files 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;