diff options
| author | Allan McRae <allan@archlinux.org> | 2012-02-11 16:56:02 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-13 10:05:18 -0600 |
| commit | e530993392dc2ac54e566a45df6c974aa68aaa23 (patch) | |
| tree | 85f5e0a6eea395a15722903dc1060bbf182ab9a4 | |
| parent | 7a3f59cd66a4f70641b863ebaaf52674b921bf3c (diff) | |
| download | pacman-e530993392dc2ac54e566a45df6c974aa68aaa23.tar.xz | |
testpkg: set gpgdir
Without setting gpgdir, testpkg outputs:
warning: Public keyring not found; have you run 'pacman-key --init'?
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | src/util/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 590bb3d2..e386d950 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 6385e417..96400a75 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); |