RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Feb-2016 22:32:07
Branch: rpm-5_4 Handle: 2016022721320700
Modified files: (Branch: rpm-5_4)
rpm/rpmdb hdrfmt.c
Log:
Add the ability to query the packageorigin
Written by jbj at rpm5.org
Upstream-Status: Inappropriate [not author]
Signed-off-by: Mark Hatle <mark.ha...@windriver.com>
Summary:
Revision Changes Path
1.151.2.32 +4 -2 rpm/rpmdb/hdrfmt.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.151.2.31 -r1.151.2.32 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 2 Jun 2015 15:09:14 -0000 1.151.2.31
+++ rpm/rpmdb/hdrfmt.c 27 Feb 2016 21:32:07 -0000 1.151.2.32
@@ -2534,8 +2534,10 @@
int rc = 1;
he->tag = RPMTAG_PACKAGEORIGIN;
- if (!headerGet(h, he, HEADERGET_NOEXTENSION)
- && (origin = headerGetOrigin(h)) != NULL)
+ /* XXX two sources for tag data: what search precedence? */
+ if (headerGet(h, he, HEADERGET_NOEXTENSION))
+ rc = 0;
+ else if ((origin = headerGetOrigin(h)) != NULL)
{
he->t = RPM_STRING_TYPE;
he->p.str = xstrdup(origin);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
