aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-21 16:15:51 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-21 16:15:51 +0000
commitd8b8fdb5e7448fa36e71a8c57b8f7e23fbdeb4de (patch)
treeedb4bb6a91258d24a72d18cd0dade6c228db7c20
parente96090c36ace007e54b5c764bc43e5c09b31009e (diff)
downloadrpmdrake-d8b8fdb5e7448fa36e71a8c57b8f7e23fbdeb4de.tar
rpmdrake-d8b8fdb5e7448fa36e71a8c57b8f7e23fbdeb4de.tar.gz
rpmdrake-d8b8fdb5e7448fa36e71a8c57b8f7e23fbdeb4de.tar.bz2
rpmdrake-d8b8fdb5e7448fa36e71a8c57b8f7e23fbdeb4de.tar.xz
rpmdrake-d8b8fdb5e7448fa36e71a8c57b8f7e23fbdeb4de.zip
(do_merge_if_needed) only look at config files, no need to look at the
whole file list (backported from trunk)
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/rpmnew.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4515c4bb..cd29e2c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- makes --merge-all-rpmnew option slight faster
+
Version 5.34 - 13 May 2012, Pascal Terjan
- rpmdrake:
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;