RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 14-Apr-2008 13:29:30
Branch: rpm-5_1 Handle: 2008041411292901
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/lib rpmte.c
Log:
- jbj: rpmte: fix: snip ".arch" from "-release", same NEVRA check
broke.
Summary:
Revision Changes Path
1.2288.2.9 +1 -0 rpm/CHANGES
2.79.2.1 +3 -0 rpm/lib/rpmte.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.8 -r1.2288.2.9 CHANGES
--- rpm/CHANGES 14 Apr 2008 11:17:25 -0000 1.2288.2.8
+++ rpm/CHANGES 14 Apr 2008 11:29:29 -0000 1.2288.2.9
@@ -1,5 +1,6 @@
5.1b2 -> 5.1.0:
+ - jbj: rpmte: fix: snip ".arch" from "-release", same NEVRA check broke.
- nkukard: support building under Linux/uClibc in addition to Linux/GLIBC
- jbj: update id.po from Translation Project.
- rse: merge OpenPKG-specific "extension-based-compression-detection"
change
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.79 -r2.79.2.1 rpmte.c
--- rpm/lib/rpmte.c 2 Apr 2008 18:35:26 -0000 2.79
+++ rpm/lib/rpmte.c 14 Apr 2008 11:29:30 -0000 2.79.2.1
@@ -103,6 +103,9 @@
assert(he->p.str != NULL);
p->NEVR = (xx ? he->p.str : xstrdup("?N-?V-?R.?A"));
p->name = xstrdup(p->NEVR);
+ /* XXX discard ".arch" from NVRA */
+ if ((p->release = strrchr(p->name, '.')) != NULL)
+ *p->release++ = '\0';
if ((p->release = strrchr(p->name, '-')) != NULL)
*p->release++ = '\0';
if ((p->version = strrchr(p->name, '-')) != NULL)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
