You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.3 KiB
37 lines
1.3 KiB
7 months ago
|
From 3ce392c9870a589cc50d2270fcf07b4d129c3dc3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Sat, 27 Mar 2021 09:31:00 +0000
|
||
|
|
Subject: [PATCH] inspection: Return RPM epoch.
|
||
|
|
|
||
|
|
Fixes: commit c9ee831affed55abe0f928134cbbd2ed83b2f510
|
||
|
|
(cherry picked from commit fef73bce7eec0ce0753a2e150e4e088020d38643)
|
||
|
|
---
|
||
|
|
daemon/rpm-c.c | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/daemon/rpm-c.c b/daemon/rpm-c.c
|
||
|
|
index 92a3abf58..be0e81e22 100644
|
||
|
|
--- a/daemon/rpm-c.c
|
||
|
|
+++ b/daemon/rpm-c.c
|
||
|
|
@@ -108,13 +108,16 @@ guestfs_int_daemon_rpm_next_application (value unitv)
|
||
|
|
|
||
|
|
h = headerLink (h);
|
||
|
|
app.app2_name = headerFormat (h, "%{NAME}", NULL);
|
||
|
|
- // XXXapp.app2_epoch = headerFormat (h, "%{NAME}", NULL);
|
||
|
|
app.app2_version = headerFormat (h, "%{VERSION}", NULL);
|
||
|
|
app.app2_release = headerFormat (h, "%{RELEASE}", NULL);
|
||
|
|
app.app2_arch = headerFormat (h, "%{ARCH}", NULL);
|
||
|
|
app.app2_url = headerFormat (h, "%{URL}", NULL);
|
||
|
|
app.app2_summary = headerFormat (h, "%{SUMMARY}", NULL);
|
||
|
|
app.app2_description = headerFormat (h, "%{DESCRIPTION}", NULL);
|
||
|
|
+
|
||
|
|
+ /* epoch is special as the only int field. */
|
||
|
|
+ app.app2_epoch = headerGetNumber (h, RPMTAG_EPOCH);
|
||
|
|
+
|
||
|
|
headerFree (h);
|
||
|
|
|
||
|
|
/* Convert this to an OCaml struct. Any NULL fields must be turned
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|