blob: 57fc6ce88ce388a10275eadfcf1686cf301f5e32 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001Add the ability to query the packageorigin
2
3Written by jbj at rpm5.org
4
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05005Upstream-Status: Submitted [RPM5 maintainer]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05006
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8
9Index: rpm-5.4.14/rpmdb/hdrfmt.c
10===================================================================
11--- rpm-5.4.14.orig/rpmdb/hdrfmt.c
12+++ rpm-5.4.14/rpmdb/hdrfmt.c
13@@ -2409,8 +2409,10 @@ static int pkgoriginTag(Header h, HE_t h
14 int rc = 1;
15
16 he->tag = RPMTAG_PACKAGEORIGIN;
17- if (!headerGet(h, he, HEADERGET_NOEXTENSION)
18- && (origin = headerGetOrigin(h)) != NULL)
19+ /* XXX two sources for tag data: what search precedence? */
20+ if (headerGet(h, he, HEADERGET_NOEXTENSION))
21+ rc = 0;
22+ else if ((origin = headerGetOrigin(h)) != NULL)
23 {
24 he->t = RPM_STRING_TYPE;
25 he->p.str = xstrdup(origin);