summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2013-07-25 17:38:52 +0200
committerMichael Schroeder <mls@suse.de>2013-07-25 17:39:15 +0200
commit27c054b4871ce52ea23347651c40e0922ea34e96 (patch)
tree71e2c641b1ae1fdf2d778f30452341eb8ab01271 /tools
parente8f6db53978a0c2de631e76658438a7c87e5c39d (diff)
downloadlibsolv-27c054b4871ce52ea23347651c40e0922ea34e96.tar.gz
libsolv-27c054b4871ce52ea23347651c40e0922ea34e96.tar.bz2
libsolv-27c054b4871ce52ea23347651c40e0922ea34e96.zip
rename rpmdb_pubkey to pubkey
Diffstat (limited to 'tools')
-rw-r--r--tools/rpmdb2solv.c10
-rw-r--r--tools/rpms2solv.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/rpmdb2solv.c b/tools/rpmdb2solv.c
index c0a2fc3..e6ed72a 100644
--- a/tools/rpmdb2solv.c
+++ b/tools/rpmdb2solv.c
@@ -25,8 +25,8 @@
#include "pool.h"
#include "repo.h"
#include "repo_rpmdb.h"
-#ifdef ENABLE_RPMDB_PUBKEY
-#include "repo_rpmdb_pubkey.h"
+#ifdef ENABLE_PUBKEY
+#include "repo_pubkey.h"
#endif
#include "repo_products.h"
#include "repo_solv.h"
@@ -63,7 +63,7 @@ main(int argc, char **argv)
char *proddir = 0;
#endif
char *outfile = 0;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
int pubkeys = 0;
#endif
@@ -99,7 +99,7 @@ main(int argc, char **argv)
case 'o':
outfile = optarg;
break;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
case 'k':
nopacks = 1;
pubkeys = 1;
@@ -150,7 +150,7 @@ main(int argc, char **argv)
exit(1);
}
}
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
if (pubkeys)
{
if (repo_add_rpmdb_pubkeys(repo, REPO_USE_ROOTDIR | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE))
diff --git a/tools/rpms2solv.c b/tools/rpms2solv.c
index 63a7f28..93ee8c3 100644
--- a/tools/rpms2solv.c
+++ b/tools/rpms2solv.c
@@ -20,8 +20,8 @@
#include "pool.h"
#include "repo.h"
#include "repo_rpmdb.h"
-#ifdef ENABLE_RPMDB_PUBKEY
-#include "repo_rpmdb_pubkey.h"
+#ifdef ENABLE_PUBKEY
+#include "repo_pubkey.h"
#endif
#include "repo_solv.h"
#include "common_write.h"
@@ -61,7 +61,7 @@ main(int argc, char **argv)
FILE *fp;
char buf[4096], *p;
const char *basefile = 0;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
int pubkeys = 0;
#endif
@@ -78,7 +78,7 @@ main(int argc, char **argv)
case '0':
manifest0 = 1;
break;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
case 'k':
pubkeys = 1;
break;
@@ -126,7 +126,7 @@ main(int argc, char **argv)
res = 0;
for (i = 0; i < nrpms; i++)
{
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
if (pubkeys)
{
if (repo_add_pubkey(repo, rpms[i], REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE) == 0)