aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake/pkg.pm
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2015-03-22 23:17:12 +0100
committerRémi Verschelde <remi@verschelde.fr>2015-03-22 23:17:12 +0100
commit80efbb77104557345ee9e45504f5c8827c241a4f (patch)
treed13d6008e1c38679a68225db845177151934da13 /Rpmdrake/pkg.pm
parent1231c5ae32d233e10336b84235c46d362aebef2d (diff)
downloadrpmdrake-80efbb77104557345ee9e45504f5c8827c241a4f.tar
rpmdrake-80efbb77104557345ee9e45504f5c8827c241a4f.tar.gz
rpmdrake-80efbb77104557345ee9e45504f5c8827c241a4f.tar.bz2
rpmdrake-80efbb77104557345ee9e45504f5c8827c241a4f.tar.xz
rpmdrake-80efbb77104557345ee9e45504f5c8827c241a4f.zip
rpmdrake: filter out critical config files from the .rpm{new,save} handling logic after installing packages (Martin Whitaker, mga#14266)
Diffstat (limited to 'Rpmdrake/pkg.pm')
-rw-r--r--Rpmdrake/pkg.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 8dd87cd0..a190da1c 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.