RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 20-Feb-2008 21:33:44
Branch: rpm-5_0 Handle: 2008022020334301
Modified files: (Branch: rpm-5_0)
rpm CHANGES
rpm/scripts gendiff
Log:
add some extra functionality to gendiff (ancient Mandriva patch by
Chmouel Boudjnah)
Summary:
Revision Changes Path
1.2054.2.49 +1 -0 rpm/CHANGES
1.1.4.1 +30 -7 rpm/scripts/gendiff
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.48 -r1.2054.2.49 CHANGES
--- rpm/CHANGES 20 Feb 2008 19:12:35 -0000 1.2054.2.48
+++ rpm/CHANGES 20 Feb 2008 20:33:43 -0000 1.2054.2.49
@@ -1,4 +1,5 @@
5.0.2 -> 5.0.3:
+ - proyvind: add some extra functionality to gendiff (ancient Mandriva
patch by Chmouel Boudjnah)
- pixel: do check free size when bavail is 0
- jbj: refactor rpmcliErase to use same code as rpmtsInstall.
- jbj: fix: rpmtsCheck non-zero return prevents --erase.
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/gendiff
============================================================================
$ cvs diff -u -r1.1 -r1.1.4.1 gendiff
--- rpm/scripts/gendiff 18 Jun 2007 16:31:33 -0000 1.1
+++ rpm/scripts/gendiff 20 Feb 2008 20:33:44 -0000 1.1.4.1
@@ -1,21 +1,44 @@
#!/bin/sh
-[ -z "$1" -o -z "$2" ] && {
-# usage
+function usage () {
echo "usage: $0 <directory> <diff-extension>" 1>&2
exit 1
}
: ${DIFF:=diff -p}
-find $1 \( -name "*$2" -o -name ".*$2" \) -print |
+if [ "$1" = "-p" -a -z "$3" ];then
+ echo "With -p you need to give the definition of patch (like dummy)"
+ exit 1
+fi
+
+if [ "$1" = "-p" ];then
+ DEFAULT_PATCH="$2"
+ shift;
+ shift;
+fi
+
+[ -z "$1" ] && usage
+
+[ -z "$PATCH_PREFIX" -a -z "$2" ] && {
+ echo "usage: $0 <directory> <diff-extension>" 1>&2
+ exit 1
+}
+
+if [ -n "$DEFAULT_PATCH" -a "$RPM" ];then
+ FILEPATCH="$RPM/SOURCES/$(echo $1|sed 's@/@@g')-$DEFAULT_PATCH.patch"
+ [ -f $FILEPATCH ] && mv -f $FILEPATCH $FILEPATCH.old
+fi
+
+[ -n "$2" ] && PATCH_PREFIX=$2
+
+find $1 \( -name "*$PATCH_PREFIX" -o -name ".*$PATCH_PREFIX" \) -print |
while read f; do
U=-u
[ "`basename $f`" = "ChangeLog$2" ] && U=-U0
-# ${DIFF} ${U} $f `echo $f | sed s/$2\$//`
- if [ -r "$f" ]; then
- ${DIFF} ${U} "${f}" "${f%$2}"
+ if [ -z "$DEFAULT_PATCH" ];then
+ ${DIFF} ${U} $f `echo $f | sed s/$PATCH_PREFIX\$//`
else
- ${DIFF} ${U} /dev/null "${f%$2}"
+ ${DIFF} ${U} $f `echo $f | sed s/$PATCH_PREFIX\$//`|tee -a $FILEPATCH
fi
done
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
