From: Michael Schroeder <mls@suse.de>
Date: Mon, 4 Jun 2018 14:19:31 +0000 (+0200)
Subject: Add RPMDB_KEEP_GPG_PUBKEY flag
X-Git-Tag: 0.6.35~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ea5ac1c28dceb1cdd4e919545b5940c2b21a8f4;p=thirdparty%2Flibsolv.git

Add RPMDB_KEEP_GPG_PUBKEY flag
---

diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
index ad221c32..1c11138c 100644
--- a/ext/repo_rpmdb.c
+++ b/ext/repo_rpmdb.c
@@ -1092,7 +1092,7 @@ rpmhead2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhe
       pool_error(pool, 0, "package has no name");
       return 0;
     }
-  if (!strcmp(name, "gpg-pubkey"))
+  if (!(flags & RPMDB_KEEP_GPG_PUBKEY) && !strcmp(name, "gpg-pubkey"))
     return 0;
   s->name = pool_str2id(pool, name, 1);
   sourcerpm = headstring(rpmhead, TAG_SOURCERPM);
diff --git a/ext/repo_rpmdb.h b/ext/repo_rpmdb.h
index 9e3bd0d4..554d48a0 100644
--- a/ext/repo_rpmdb.h
+++ b/ext/repo_rpmdb.h
@@ -25,6 +25,7 @@ extern Id repo_add_rpm(Repo *repo, const char *rpm, int flags);
 #define RPM_ADD_WITH_LEADSIGID	(1 << 16)
 #define RPM_ADD_WITH_CHANGELOG	(1 << 17)
 #define RPM_ADD_FILTERED_FILELIST (1 << 18)
+#define RPMDB_KEEP_GPG_PUBKEY   (1 << 19)
 
 #define RPMDB_EMPTY_REFREPO	(1 << 30)	/* internal */