RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 20-Jul-2007 14:39:37
Branch: HEAD Handle: 2007072013393700
Modified files:
rpm/build parsePrep.c
Log:
using rpmGenPath() on '%{_Rsourcedir}' results in '/%{_Rsourcedir}'.
Make sure this is detected correctly
Summary:
Revision Changes Path
2.81 +1 -1 rpm/build/parsePrep.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.80 -r2.81 parsePrep.c
--- rpm/build/parsePrep.c 17 Jul 2007 06:38:19 -0000 2.80
+++ rpm/build/parsePrep.c 20 Jul 2007 12:39:37 -0000 2.81
@@ -413,7 +413,7 @@
}
Rurlfn = rpmGenPath(NULL, Rmacro, sp->source);
- if (Rurlfn == NULL || *Rurlfn == '%' || !strcmp(Lurlfn, Rurlfn)) {
+ if (Rurlfn == NULL || (Rurlfn[0] == '/' && Rurlfn[1] == '%') ||
!strcmp(Lurlfn, Rurlfn)) {
rpmError(RPMERR_BADFILENAME, _("file %s missing: %s\n"),
Lurlfn, strerror(errno));
ec++;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
