From 8caf68303188699c1a1d9499c53a43794a86d922 Mon Sep 17 00:00:00 2001 From: jbj Date: Sat, 13 Jul 2002 19:54:36 +0000 Subject: [PATCH] - teach gendiff about unreadable files (#42666). CVS patchset: 5553 CVS date: 2002/07/13 19:54:36 --- CHANGES | 1 + gendiff | 7 ++++++- rpm.spec.in | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index d1c641b..9adf95f 100644 --- a/CHANGES +++ b/CHANGES @@ -169,6 +169,7 @@ - install rpmal.h and rpmhash.h, implicit rpmps.hinclude, for now. - revert headerFree/headerLink/headerUnlink debugging. - popt: mingw32 portability configure check (#67911). + - teach gendiff about unreadable files (#42666). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/gendiff b/gendiff index c00ce51..de51c57 100644 --- a/gendiff +++ b/gendiff @@ -10,5 +10,10 @@ find $1 \( -name "*$2" -o -name ".*$2" \) -print | while read f; do U=-u [ "`basename $f`" = "ChangeLog$2" ] && U=-U0 - diff ${U} $f `echo $f | sed s/$2\$//` +# diff ${U} $f `echo $f | sed s/$2\$//` + if [ -r "$f" ]; then + diff ${U} "${f}" "${f%$2}" + else + diff ${U} /dev/null "${f%$2}" + fi done diff --git a/rpm.spec.in b/rpm.spec.in index fa34e70..b8ea06c 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -518,6 +518,7 @@ fi - install rpmal.h and rpmhash.h, implicit rpmps.hinclude, for now. - revert headerFree/headerLink/headerUnlink debugging. - popt: mingw32 portability configure check (#67911). +- teach gendiff about unreadable files (#42666). * Fri Jul 12 2002 Jeff Johnson 4.1-0.47 - display signature details using rpm -qi. -- 2.7.4