aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-08-27 20:18:55 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-08-27 20:18:55 +0000
commit5a4daf6c34acf5c5ea56f5f66d9bbb1fa92fbd4a (patch)
treef519ac1276e8189b95db260a8a7d1d14af4bd983
parentdef2a251b2d30bb5703e8c7a2812071fd40b3c2e (diff)
downloadrpmdrake-5a4daf6c34acf5c5ea56f5f66d9bbb1fa92fbd4a.tar
rpmdrake-5a4daf6c34acf5c5ea56f5f66d9bbb1fa92fbd4a.tar.gz
rpmdrake-5a4daf6c34acf5c5ea56f5f66d9bbb1fa92fbd4a.tar.bz2
rpmdrake-5a4daf6c34acf5c5ea56f5f66d9bbb1fa92fbd4a.tar.xz
rpmdrake-5a4daf6c34acf5c5ea56f5f66d9bbb1fa92fbd4a.zip
ignore some files (static list) for .rpmnew solving
-rwxr-xr-xrpmdrake5
1 files changed, 4 insertions, 1 deletions
diff --git a/rpmdrake b/rpmdrake
index 2808b987..115b94dd 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -782,10 +782,13 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
myexit -1;
}
my $exitstatus = $?;
+ # /var/lib/nfs/etab /var/lib/nfs/rmtab /var/lib/nfs/xtab /var/cache/man/whatis
+ my @ignores_rpmnew = qw(/etc/group /etc/passwd /etc/localtime /etc/shells /etc/adjtime /etc/ld.so.conf /etc/modules
+ /etc/security/fileshare.conf /etc/sudoers);
my %pkg2rpmnew;
foreach my $u (@rpms_upgrade) {
$u =~ m|/([^/]+-[^-]+-[^-]+)\.[^\./]+\.rpm$|
- and $pkg2rpmnew{$1} = [ grep { m|^/etc| && -r "$_.rpmnew" } map { chomp_($_) } `rpm -ql $1` ];
+ and $pkg2rpmnew{$1} = [ grep { m|^/etc| && -r "$_.rpmnew" && !member($_, @ignores_rpmnew) } map { chomp_($_) } `rpm -ql $1` ];
}
if ($exitstatus == 0 && keys(%pkg2rpmnew) == 0) {
interactive_msg(_("Everything installed successfully"), _("All requested packages were installed successfully."));