summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/media.pm1
-rw-r--r--perl-install/install/pkgs.pm11
-rw-r--r--perl-install/install/steps_interactive.pm2
4 files changed, 1 insertions, 14 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cc146e296..5a9e9ca7b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- drop clean_rpmdb_shared_regions() hack which breaks rpmdb
- fix building with new libX11
- fix building with xserver-1.9
- include missing perl modules (#60720)
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 98ed059d1..ff8021107 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -912,7 +912,6 @@ sub log_sizes() {
log::l(sprintf "Installed: %dMB(df), %dMB(rpm)",
($df[0] - $df[1]) / 1024,
sum(run_program::rooted_get_stdout($::prefix, 'rpm', '-qa', '--queryformat', '%{size}\n')) / 1024 / 1024) if -x "$::prefix/bin/rpm";
- install::pkgs::clean_rpmdb_shared_regions();
}
1;
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 9a24a6f40..eabba9f16 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -558,8 +558,6 @@ sub _openInstallLog() {
sub rpmDbOpen {
my ($b_rebuild_if_needed) = @_;
- clean_rpmdb_shared_regions();
-
my $need_rebuild = $b_rebuild_if_needed && !URPM::DB::verify($::prefix);
if ($need_rebuild) {
@@ -594,12 +592,7 @@ sub rpmDbOpen {
$db;
}
-sub clean_rpmdb_shared_regions() {
- unlink glob("$::prefix/var/lib/rpm/__db.*");
-}
-
sub open_rpm_db_rw() {
- clean_rpmdb_shared_regions();
my $db = URPM::DB::open($::prefix, 1);
$db and log::l("opened rpmdb for writing in $::prefix");
$db;
@@ -682,8 +675,6 @@ sub install {
my %packages;
delete $packages->{rpmdb}; #- make sure rpmdb is closed before.
- #- avoid potential problems with rpm db personality change
- clean_rpmdb_shared_regions();
return if !@$toInstall;
@@ -723,8 +714,6 @@ sub install {
# prevent urpmi from trying to install them again (CHECKME: maybe uneeded):
$packages->{state} = {};
- clean_rpmdb_shared_regions(); #- workaround librpm which is buggy when using librpm rooted and the just installed rooted library
-
fs::loopback::save_boot($loop_boot);
}
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 44bec8571..bbf7dda33 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -749,13 +749,11 @@ Do you want to install the updates?")),
#- bring all interface up for installing updates packages.
install::interactive::upNetwork($o);
- install::pkgs::clean_rpmdb_shared_regions();
if (any::urpmi_add_all_media($o, $o->{previous_release})) {
my $binary = find { whereis_binary($_, $::prefix) } 'gurpmi2', 'urpmi' or return;
my $log_file = '/root/drakx/updates.log';
run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select', '--update');
}
- install::pkgs::clean_rpmdb_shared_regions();
#- not downing network, even ppp. We don't care much since it is the end of install :)
}