diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-22 21:43:47 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-22 21:43:47 +0000 |
| commit | f932caa45cf4fbcf8903ad4f6f5ba727a435777f (patch) | |
| tree | b95f994b3ffe6f563a764c36d0de178fd68dca86 | |
| parent | e651eaa8011ee732d0ef05d28f12eadbb778a751 (diff) | |
| download | rpmdrake-f932caa45cf4fbcf8903ad4f6f5ba727a435777f.tar rpmdrake-f932caa45cf4fbcf8903ad4f6f5ba727a435777f.tar.gz rpmdrake-f932caa45cf4fbcf8903ad4f6f5ba727a435777f.tar.bz2 rpmdrake-f932caa45cf4fbcf8903ad4f6f5ba727a435777f.tar.xz rpmdrake-f932caa45cf4fbcf8903ad4f6f5ba727a435777f.zip | |
consider all config files, not only those in /etc
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Rpmdrake/rpmnew.pm | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,5 @@ - --merge-all-rpmnew mode: + o consider all config files, not only those in /etc o ignore /etc/{passwd,group,(g)shadow,hosts,resolv.conf} (too dangerous) Version 5.47 - 21 Apr 2013, Thierry Vignaud diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm index 0c9fa700..9bf40891 100644 --- a/Rpmdrake/rpmnew.pm +++ b/Rpmdrake/rpmnew.pm @@ -197,7 +197,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]->conf_files ]; + $pkg2rpmnew{$n} = [ grep { (-r "$_.rpmnew" || -r "$_.rpmsave") } map { chomp_($_) } $_[0]->conf_files ]; }); print "done.\n"; undef $wait; |