From 535660fde655bbde76eb84f4d451044b8a2a2dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@verschelde.fr>
Date: Mon, 23 Mar 2015 08:24:25 +0100
Subject: rpmdrake: filter out critical config files from the .rpm{new,save}
 handling logic after installing packages (Martin Whitaker, mga#14266)

---
 NEWS               | 4 ++++
 Rpmdrake/pkg.pm    | 2 +-
 Rpmdrake/rpmnew.pm | 7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 5c9cbe5b..955f1b1e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- rpmdrake:
+  o filter out critical config files from the .rpm{new,save} handling
+    logic after installing packages (Martin Whitaker, mga#14266)
+
 Version 6.10.3 - 28 June 2014, Thierry Vignaud
 
 - rpmdrake
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 907def78..b5e9193c 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -855,7 +855,7 @@ sub perform_installation {  #- (partially) duplicated from /usr/sbin/urpmi :-(
                                  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 ];
+				     $pkg2rpmnew{$pkg->fullname} = [ grep { (-r "$_.rpmnew" || -r "$_.rpmsave") && !ignore_rpmnew($_) } $pkg->conf_files ];
                                  }
                                  statusbar_msg_remove($id);
                                  dialog_rpmnew(N("The installation is finished; everything was installed correctly.
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index ef213a67..cc88b8eb 100644
--- a/Rpmdrake/rpmnew.pm
+++ b/Rpmdrake/rpmnew.pm
@@ -36,7 +36,7 @@ use mygtk3 qw(gtknew);  #- do not import anything else, especially gtkadd() whic
 use ugtk3 qw(:all);
 use Exporter;
 our @ISA = qw(Exporter);
-our @EXPORT = qw(dialog_rpmnew do_merge_if_needed);
+our @EXPORT = qw(ignore_rpmnew dialog_rpmnew do_merge_if_needed);
 
 # /var/lib/nfs/etab /var/lib/nfs/rmtab /var/lib/nfs/xtab /var/cache/man/whatis
 my %ignores_rpmnew = map { $_ => 1 } qw(
@@ -71,6 +71,11 @@ my %ignores_rpmnew = map { $_ => 1 } qw(
     /etc/sysconfig/xinetd
 );
 
+sub ignore_rpmnew {
+  my ($conf_file) = @_;
+  $ignores_rpmnew{$conf_file};
+}
+
 sub inspect {
 	my ($file) = @_;
 	my ($rpmnew, $rpmsave) = ("$file.rpmnew", "$file.rpmsave");
-- 
cgit v1.2.1