From 16138ba6a0457232c8617e6c673dd92345ff0f8c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 14 Apr 2009 10:16:12 +0000
Subject: ignore /etc/fstab for *.rpmnew

---
 NEWS               | 2 ++
 Rpmdrake/rpmnew.pm | 1 +
 2 files changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 27794502..b7a74c2e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- ignore /etc/fstab for *.rpmnew
+
 Version 5.16 - 3 April 2009, Thierry Vignaud
 
 - revert using installer hack that prevents having gray wait message dialogs on
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index 2545e5cd..325882be 100644
--- a/Rpmdrake/rpmnew.pm
+++ b/Rpmdrake/rpmnew.pm
@@ -40,6 +40,7 @@ our @EXPORT = qw(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(
     /etc/adjtime
+    /etc/fstab
     /etc/group
     /etc/ld.so.conf
     /etc/localtime
-- 
cgit v1.2.1