summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/pkgs.pm12
2 files changed, 2 insertions, 11 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a18d6dcce..759d15cd0 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,5 @@
- drakx-in-chroot:
o do not run monitor-edid with drakx-in-chroot (timeout)
-- do not try to add nofsync to __dbi_cdb if it is not defined
Version 18.0 - 25 August 2018
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 1512cf4f6..3317f0fbe 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -770,12 +770,6 @@ sub _filter_packages {
} @packages;
}
-sub _set_dbi_cdb_nofsync {
- if ((my $dbi_cdb = URPM::expand('%__dbi_cdb')) ne '%__dbi_cdb') {
- URPM::add_macro("__dbi_cdb $dbi_cdb nofsync");
- }
-}
-
sub install {
my ($isUpgrade, $toInstall, $packages, $callback) = @_;
my %packages;
@@ -804,9 +798,7 @@ sub install {
URPM::read_config_files();
# force loading libnss*
getgrent();
-
- _set_dbi_cdb_nofsync();
-
+ URPM::add_macro(join(' ', '__dbi_cdb', URPM::expand('%__dbi_cdb'), 'nofsync'));
my $LOG = _openInstallLog();
$packages->{log} = $packages->{info} = $packages->{print} = sub {
@@ -1071,7 +1063,7 @@ sub _remove_raw {
log::l("removing: " . join(' ', @$to_remove));
URPM::read_config_files();
- _set_dbi_cdb_nofsync();
+ URPM::add_macro(URPM::expand('__dbi_cdb %__dbi_cdb nofsync'));
my $db = open_rpm_db_rw() or die "error opening RPM database: ", URPM::rpmErrorString();
my $trans = $db->create_transaction;