X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Frpmmerge;h=baec0c1668c3019510276acaa5f8f84b0294dc55;hp=c61a6b7df50e6690e48ba7ce8b63de134f62cd80;hb=HEAD;hpb=3e5c2346122a5711eb890c9de44a7f9d9d36a623;ds=sidebyside

diff --git a/bin/rpmmerge b/bin/rpmmerge
index c61a6b7..a163307 100755
--- a/bin/rpmmerge
+++ b/bin/rpmmerge
@@ -21,7 +21,9 @@ for base in $l;do
 
 	if test ! -f $orig
 	then
-		cmp $base $base.rpmnew
+		if [ "$base" = "${base%/java.security}" ];then
+			cmp $base $base.rpmnew
+		fi
 		mv -f $base.rpmnew $base
 		continue
 	fi
@@ -54,7 +56,7 @@ done
 if $ok
 then
 	mkdir -p /root/rpmmerge
-	rpm -qac|perl -ne 'chomp;next if $_ eq "(contains no files)";next if m{^/var/lib/rpm/};next if $_ eq "/usr/lib/locale/locale-archive";next if ! -f $_;$o=$_;$o="/root/rpmmerge/$o";next if -e $o;$od=$o;$od=~s{[^/]*$}{};system "mkdir -p '\''$od'\''" and die "dir $_: $!";system "cp -i -p '\''$_'\'' '\''$o'\''" and die "$_: $!";'
+	rpm -qac|perl -ne 'chomp;next if $_ eq "(contains no files)";next if m{^/var/lib/rpm/};next if $_ eq "/usr/lib/locale/locale-archive";next if $_ eq "/usr/lib/sysimage/rpm/rpmdb.sqlite";next if ! -f $_;$o=$_;$o="/root/rpmmerge/$o";next if -e $o;$od=$o;$od=~s{[^/]*$}{};system "mkdir -p '\''$od'\''" and die "dir $_: $!";system "cp -i -p '\''$_'\'' '\''$o'\''" and die "$_: $!";'
 
 	echo OK
 else