RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarlsen@rpm5.org
Module: rpm Date: 09-Dec-2007 05:59:39
Branch: rpm-4_5 Handle: 2007120904593900
Modified files: (Branch: rpm-4_5)
rpm/scripts check-files
Log:
Fix diff issue when buildroot contains some "//" (from nanar)
Summary:
Revision Changes Path
1.5.2.2 +4 -2 rpm/scripts/check-files
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/scripts/check-files
============================================================================
$ cvs diff -u -r1.5.2.1 -r1.5.2.2 check-files
--- rpm/scripts/check-files 9 Dec 2007 04:58:24 -0000 1.5.2.1
+++ rpm/scripts/check-files 9 Dec 2007 04:59:39 -0000 1.5.2.2
@@ -13,12 +13,14 @@
exit 1
fi
+RPM_BUILD_ROOT=`echo $RPM_BUILD_ROOT | sed 's://*:/:g'`
[ "$TMPDIR" ] || TMPDIR=/tmp
FILES_DISK=`mktemp $TMPDIR/rpmXXXXXX`
FILES_RPM=`mktemp $TMPDIR/rpmXXXXXX`
-find $RPM_BUILD_ROOT -type f -o -type l | LC_ALL=C sort > $FILES_DISK
-LC_ALL=C sort -u > $FILES_RPM
+
+find $RPM_BUILD_ROOT -type f -o -type l | sed 's://*:/:g' | LC_ALL=C sort > $FILES_DISK
+sed 's://*:/:g' | LC_ALL=C sort -u > $FILES_RPM
diff "$FILES_DISK" "$FILES_RPM" | grep "^< " | cut -c3- | sed -e "s#^$RPM_BUILD_ROOT# #g"
@@ .
Received on Sun Dec 9 05:59:39 2007