RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 17-Aug-2008 17:51:24
Branch: rpm-5_1 Handle: 2008081715512301
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/scripts check-files
Log:
- jbj: WR: fakeroot maps devices to files. avoid /dev/* in checkfiles.
Summary:
Revision Changes Path
1.2288.2.80 +1 -0 rpm/CHANGES
1.6.2.1 +4 -1 rpm/scripts/check-files
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.79 -r1.2288.2.80 CHANGES
--- rpm/CHANGES 16 Aug 2008 17:20:56 -0000 1.2288.2.79
+++ rpm/CHANGES 17 Aug 2008 15:51:23 -0000 1.2288.2.80
@@ -1,4 +1,5 @@
5.1.4 -> 5.1.5:
+ - jbj: WR: fakeroot maps devices to files. avoid /dev/* in checkfiles.
- jbj: db_tool: remove gcc whinings.
- jbj: QNX: use strtouq() instead of strtoul() in rpmmtree.
- jbj: QNX: retrofit asprintf.h (from XAR) for the deprived. rpmmtree uses
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/check-files
============================================================================
$ cvs diff -u -r1.6 -r1.6.2.1 check-files
--- rpm/scripts/check-files 8 Feb 2008 13:14:35 -0000 1.6
+++ rpm/scripts/check-files 17 Aug 2008 15:51:24 -0000 1.6.2.1
@@ -17,7 +17,10 @@
FILES_DISK=`mktemp $TMPDIR/rpmXXXXXX`
FILES_RPM=`mktemp $TMPDIR/rpmXXXXXX`
-find $RPM_BUILD_ROOT -type f -o -type l | sed 's://*:/:g' | LC_ALL=C sort > $FILES_DISK
+find $RPM_BUILD_ROOT -type f -o -type l | \
+ sed 's://*:/:g' | \
+ sed "s,$RPM_BUILD_ROOT/dev/.*,," | \
+ 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 Aug 17 17:51:24 2008