diff options
| -rw-r--r-- | Changes | 4 | ||||
| -rw-r--r-- | lib/ManaTools/Rpmdragora/pkg.pm | 2 | ||||
| -rw-r--r-- | lib/ManaTools/Rpmdragora/rpmnew.pm | 7 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,7 @@ + - rpmdragora: filter out critical config files from the + .rpm{new,save} handling logic after installing packages + (Martin Whitaker, mga#14266) + 1.0.0-8 17/02/2015 22:22 - Added common shortcuts for dialog push buttons such as About, Quit, OK, Cancel (Translators should set the '&' in the diff --git a/lib/ManaTools/Rpmdragora/pkg.pm b/lib/ManaTools/Rpmdragora/pkg.pm index ba0b18b7..4c39356f 100644 --- a/lib/ManaTools/Rpmdragora/pkg.pm +++ b/lib/ManaTools/Rpmdragora/pkg.pm @@ -965,7 +965,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); rpmnew_dialog($loc->N("The installation is finished; everything was installed correctly. diff --git a/lib/ManaTools/Rpmdragora/rpmnew.pm b/lib/ManaTools/Rpmdragora/rpmnew.pm index 659c0b29..86f4d10d 100644 --- a/lib/ManaTools/Rpmdragora/rpmnew.pm +++ b/lib/ManaTools/Rpmdragora/rpmnew.pm @@ -42,7 +42,7 @@ use yui; use Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw(rpmnew_dialog do_merge_if_needed); +our @EXPORT = qw(ignore_rpmnew dialog_rpmnew do_merge_if_needed); my $loc = ManaTools::rpmdragora::locale(); @@ -74,6 +74,11 @@ my %ignores_rpmnew = map { $_ => 1 } qw( /etc/sysconfig/xinetd ); +sub ignore_rpmnew { + my ($conf_file) = @_; + $ignores_rpmnew{$conf_file}; +} + #============================================================= |