summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-07-13 19:54:36 +0000
committerjbj <devnull@localhost>2002-07-13 19:54:36 +0000
commit8caf68303188699c1a1d9499c53a43794a86d922 (patch)
tree70194bb4a49aa2344811f5a8e23a7c27b9cc7f41
parentfa1098b41069d66a3c7b6ba2bc07dba945ebc850 (diff)
downloadlibrpm-tizen-8caf68303188699c1a1d9499c53a43794a86d922.tar.gz
librpm-tizen-8caf68303188699c1a1d9499c53a43794a86d922.tar.bz2
librpm-tizen-8caf68303188699c1a1d9499c53a43794a86d922.zip
- teach gendiff about unreadable files (#42666).
CVS patchset: 5553 CVS date: 2002/07/13 19:54:36
-rw-r--r--CHANGES1
-rw-r--r--gendiff7
-rw-r--r--rpm.spec.in1
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index d1c641b79..9adf95f4a 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 c00ce5156..de51c5710 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 fa34e70eb..b8ea06c11 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 <jbj@redhat.com> 4.1-0.47
- display signature details using rpm -qi.