|
Igor Gnatenko |
3992a6 |
From e7462b81f69933f531ee6905681a24ac61e11bf6 Mon Sep 17 00:00:00 2001
|
|
Igor Gnatenko |
3992a6 |
From: Florian Festi <ffesti@redhat.com>
|
|
Igor Gnatenko |
3992a6 |
Date: Fri, 7 Jul 2017 11:30:42 +0200
|
|
Igor Gnatenko |
3992a6 |
Subject: [PATCH 54/54] rpmfc: fix ternary operator
|
|
Igor Gnatenko |
3992a6 |
|
|
Igor Gnatenko |
3992a6 |
Fixes: 9d5bbd9774d00f50749bb045217eaf91c87b6de0
|
|
Igor Gnatenko |
3992a6 |
References: https://bugzilla.redhat.com/show_bug.cgi?id=1468476
|
|
Igor Gnatenko |
3992a6 |
Tested-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
|
|
Igor Gnatenko |
3992a6 |
Signed-off-by: Florian Festi <ffesti@redhat.com>
|
|
Igor Gnatenko |
3992a6 |
(cherry picked from commit cbb062963b535186a461dfc9e03558a72ec8004d)
|
|
Igor Gnatenko |
3992a6 |
---
|
|
Igor Gnatenko |
3992a6 |
build/rpmfc.c | 2 +-
|
|
Igor Gnatenko |
3992a6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Igor Gnatenko |
3992a6 |
|
|
Igor Gnatenko |
3992a6 |
diff --git a/build/rpmfc.c b/build/rpmfc.c
|
|
Igor Gnatenko |
3992a6 |
index 72f29ddf5..271bfbea8 100644
|
|
Igor Gnatenko |
3992a6 |
--- a/build/rpmfc.c
|
|
Igor Gnatenko |
3992a6 |
+++ b/build/rpmfc.c
|
|
Igor Gnatenko |
3992a6 |
@@ -1259,7 +1259,7 @@ static rpmRC rpmfcApplyExternal(rpmfc fc)
|
|
Igor Gnatenko |
3992a6 |
}
|
|
Igor Gnatenko |
3992a6 |
|
|
Igor Gnatenko |
3992a6 |
/* Parse dependencies into header */
|
|
Igor Gnatenko |
3992a6 |
- rc = parseRCPOT(NULL, fc->pkg, getStringBuf(sb_stdout), dm->ntag ? dm->ntag != -1 : RPMTAG_REQUIRENAME, 0, tagflags, addReqProvPkg, NULL);
|
|
Igor Gnatenko |
3992a6 |
+ rc = parseRCPOT(NULL, fc->pkg, getStringBuf(sb_stdout), dm->ntag != -1 ? dm->ntag : RPMTAG_REQUIRENAME, 0, tagflags, addReqProvPkg, NULL);
|
|
Igor Gnatenko |
3992a6 |
freeStringBuf(sb_stdout);
|
|
Igor Gnatenko |
3992a6 |
|
|
Igor Gnatenko |
3992a6 |
if (rc) {
|
|
Igor Gnatenko |
3992a6 |
--
|
|
Igor Gnatenko |
3992a6 |
2.13.2
|
|
Igor Gnatenko |
3992a6 |
|