aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-03-29 15:27:48 +0000
committerThierry Vignaud <tv@mandriva.org>2007-03-29 15:27:48 +0000
commit5a2ff32d72d702bf10ed2de7f8251629dfa92965 (patch)
tree24768532456e09cc65a85d094f31d26c1a098aa7 /Rpmdrake
parentd2085470fcc72bc36e9cc7dc5575fe1b1d437f3a (diff)
downloadrpmdrake-5a2ff32d72d702bf10ed2de7f8251629dfa92965.tar
rpmdrake-5a2ff32d72d702bf10ed2de7f8251629dfa92965.tar.gz
rpmdrake-5a2ff32d72d702bf10ed2de7f8251629dfa92965.tar.bz2
rpmdrake-5a2ff32d72d702bf10ed2de7f8251629dfa92965.tar.xz
rpmdrake-5a2ff32d72d702bf10ed2de7f8251629dfa92965.zip
(do_merge_if_needed) fix "rpmdrake --merge-all-rpmnew" (#29993)
(got broken in r148201 as a side effect of #26069)
Diffstat (limited to 'Rpmdrake')
-rwxr-xr-xRpmdrake/rpmnew.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index 0b76a7b6..14e32aa7 100755
--- a/Rpmdrake/rpmnew.pm
+++ b/Rpmdrake/rpmnew.pm
@@ -181,7 +181,7 @@ sub do_merge_if_needed() {
my %pkg2rpmnew;
my $wait = wait_msg(N("Please wait, searching..."));
print "Searching .rpmnew and .rpmsave files...\n";
- $Rpmdrake::pkg::db->traverse(sub {
+ Rpmdrake::pkg::open_db()->traverse(sub {
my $n = my_fullname($_[0]);
$pkg2rpmnew{$n} = [ grep { m|^/etc| && (-r "$_.rpmnew" || -r "$_.rpmsave") } map { chomp_($_) } $_[0]->files ];
});