From bc5368712767c63bb261c1f8b9cca069651fc7c7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 6 Dec 2012 09:01:59 +0000
Subject: (post_extract) keep IDs of packages rather than their paths

(success_summary) look at _all_ config files and only those instead of
manually matching file paths beginning with "^/etc" (mga#8310)

also do not fork useless rpm processes

(backported from trunk)
---
 NEWS            |  3 +++
 Rpmdrake/pkg.pm | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 8073c0d6..33164c60 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- look at _all_ config files and only those instead of manually
+  matching file paths beginning with "^/etc" (mga#8310)
+
 Version 5.34.1 - 21 September 2012, Thierry Vignaud
 
 - display package basenames when signature checking fails
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 9d273a06..2a4be887 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -809,7 +809,7 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
                                  $transaction_progress_nb = 0;
                                  $done += grep { !/\.src\.rpm$/ } values %$transaction_sources;         #updates
                                  $total = keys(%$transaction_sources_install) + keys %$transaction_sources;
-                                 push @rpms_upgrade, grep { !/\.src\.rpm$/ } values %$transaction_sources;
+                                 push @rpms_upgrade, keys %$transaction_sources;
                                  $done += grep { !/\.src\.rpm$/ } values %$transaction_sources_install; # installs
                              },
                              pre_removable => sub {
@@ -872,10 +872,10 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
                                  }
                                  my $id = statusbar_msg(N("Inspecting configuration files..."), 0);
                                  my %pkg2rpmnew;
-                                 foreach my $u (@rpms_upgrade) {
-                                     $u =~ m|/([^/]+-[^-]+-[^-]+)\.[^\./]+\.rpm$|
-                                       and $pkg2rpmnew{$1} = [ grep { m|^/etc| && (-r "$_.rpmnew" || -r "$_.rpmsave") }
-                                                                 map { chomp_($_) } run_rpm("rpm -ql $1") ];
+                                 foreach my $id (@rpms_upgrade) {
+				     my $pkg = $urpm->{depslist}[$id];
+				     next if $pkg->arch eq 'src';
+				     $pkg2rpmnew{$pkg->fullname} = [ grep { -r "$_.rpmnew" || -r "$_.rpmsave" } $pkg->conf_files ];
                                  }
                                  statusbar_msg_remove($id);
                                  dialog_rpmnew(N("The installation is finished; everything was installed correctly.
-- 
cgit v1.2.1