[pacman-dev] [PATCH] testpkg: set gpgdir
Allan McRae
allan at archlinux.org
Sat Feb 11 02:13:39 EST 2012
Without setting gpgdir, testpkg outputs:
warning: Public keyring not found; have you run 'pacman-key --init'?
Signed-off-by: Allan McRae <allan at archlinux.org>
---
Note that this uses a compile time patch to the GPGDIR. testpkg does
this for DBPATH too. It is probably not worth allowing these to be
overridden via pacman.conf until we have a config parser function
available.
src/util/Makefile.am | 2 ++
src/util/testpkg.c | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 590bb3d..e386d95 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,6 +1,7 @@
# paths set at make time
conffile = ${sysconfdir}/pacman.conf
dbpath = ${localstatedir}/lib/pacman/
+gpgdir = ${sysconfdir}/pacman.d/gnupg/
cachedir = ${localstatedir}/cache/pacman/pkg/
bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree
@@ -8,6 +9,7 @@ bin_PROGRAMS = vercmp testpkg testdb cleanupdelta pacsort pactree
DEFS = -DLOCALEDIR=\"@localedir@\" \
-DCONFFILE=\"$(conffile)\" \
-DDBPATH=\"$(dbpath)\" \
+ -DGPGDIR=\"$(gpgdir)\" \
-DCACHEDIR=\"$(cachedir)\" \
@DEFS@
diff --git a/src/util/testpkg.c b/src/util/testpkg.c
index 6385e41..96400a7 100644
--- a/src/util/testpkg.c
+++ b/src/util/testpkg.c
@@ -59,6 +59,9 @@ int main(int argc, char *argv[])
/* let us get log messages from libalpm */
alpm_option_set_logcb(handle, output_cb);
+ /* set gpgdir to default */
+ alpm_option_set_gpgdir(handle, GPGDIR);
+
if(alpm_pkg_load(handle, argv[1], 1, level, &pkg) == -1
|| pkg == NULL) {
err = alpm_errno(handle);
--
1.7.9
More information about the pacman-dev
mailing list