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: 08-Feb-2008 14:12:43
Branch: rpm-5_0 Handle: 2008020813124300
Modified files: (Branch: rpm-5_0)
rpm CHANGES
rpm/scripts check-files
Log:
trim multiple slashes from buildroot for check-files script (from
Olivier Thauvin)
Summary:
Revision Changes Path
1.2054.2.43 +1 -0 rpm/CHANGES
1.5.4.1 +3 -3 rpm/scripts/check-files
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.42 -r1.2054.2.43 CHANGES
--- rpm/CHANGES 8 Feb 2008 11:40:14 -0000 1.2054.2.42
+++ rpm/CHANGES 8 Feb 2008 13:12:43 -0000 1.2054.2.43
@@ -1,4 +1,5 @@
5.0.2 -> 5.0.3:
+ - proyvind: trim multiple slashes from buildroot for check-files script
(from Nanar/Olivier Thauvin)
- proyvind: make rpmdb cpp compliant (from spturtle/Christiaan Welvaart)
- jbj: fix: (again) rpmtsCheck() needs to return 1 when problems exist.
- rse: add support for QNX by adjusting to its 3-parameter based
makedev(2)
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/check-files
============================================================================
$ cvs diff -u -r1.5 -r1.5.4.1 check-files
--- rpm/scripts/check-files 25 May 2007 17:36:39 -0000 1.5
+++ rpm/scripts/check-files 8 Feb 2008 13:12:43 -0000 1.5.4.1
@@ -6,7 +6,7 @@
#
# [EMAIL PROTECTED]
-RPM_BUILD_ROOT="$1"
+RPM_BUILD_ROOT=`echo $1 | sed 's://*:/:g'`
if [ ! -d "$RPM_BUILD_ROOT" ] ; then
cat > /dev/null
@@ -17,8 +17,8 @@
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 > $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"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
