aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-24 11:07:58 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-24 11:07:58 +0000
commit5dbaf97b4b6151ba1f63649bbdd74380ca2e2f57 (patch)
tree0d0a3d004b99409e1b5a010a8f55775b5a564919
parent7f29f6bd3ca3071675e4f5ccb04dc88f6106f737 (diff)
downloadrpmdrake-5dbaf97b4b6151ba1f63649bbdd74380ca2e2f57.tar
rpmdrake-5dbaf97b4b6151ba1f63649bbdd74380ca2e2f57.tar.gz
rpmdrake-5dbaf97b4b6151ba1f63649bbdd74380ca2e2f57.tar.bz2
rpmdrake-5dbaf97b4b6151ba1f63649bbdd74380ca2e2f57.tar.xz
rpmdrake-5dbaf97b4b6151ba1f63649bbdd74380ca2e2f57.zip
(do_merge_if_needed) only look at config files, no need to look at the
whole file list
-rw-r--r--NEWS1
-rw-r--r--Rpmdrake/rpmnew.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6ca51ebb..65cf3cba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- display package basenames when signature checking fails
+- makes --merge-all-rpmnew option slight faster
Version 5.34 - 13 May 2012, Pascal Terjan
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index f3cf5ba5..4fd4a4fe 100644
--- a/Rpmdrake/rpmnew.pm
+++ b/Rpmdrake/rpmnew.pm
@@ -193,7 +193,7 @@ sub do_merge_if_needed() {
# costly:
open_rpm_db()->traverse(sub {
my $n = my_fullname($_[0]);
- $pkg2rpmnew{$n} = [ grep { m|^/etc| && (-r "$_.rpmnew" || -r "$_.rpmsave") } map { chomp_($_) } $_[0]->files ];
+ $pkg2rpmnew{$n} = [ grep { m|^/etc| && (-r "$_.rpmnew" || -r "$_.rpmsave") } map { chomp_($_) } $_[0]->conf_files ];
});
print "done.\n";
undef $wait;