Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-15 12:02:29 -0500
committerDan McGee <dan@archlinux.org>2011-06-15 12:02:29 -0500
commit1cd6515af0ae5d1c3dabd30749a37cfefa7dc4f5 (patch)
tree78ce0656e9200a255537a3c821716e9c90583ac9 /src
parentd21f6ca4aa3209938fa312f29ac03446f57e6a66 (diff)
API: change 'signaturedir' to 'gpgdir'
This is more in line with reality and what we have our makepkg, etc. options named anyway. Original-patch-by: Kerrick Staley <mail@kerrickstaley.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/conf.c2
-rw-r--r--src/pacman/pacman.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 82f525c4..081cdd5e 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -467,7 +467,7 @@ static int setup_libalpm(void)
/* Set GnuPG's home directory. This is not relative to rootdir, even if
* rootdir is defined. Reasoning: gpgdir contains configuration data. */
config->gpgdir = config->gpgdir ? config->gpgdir : strdup(GPGDIR);
- ret = alpm_option_set_signaturedir(handle, config->gpgdir);
+ ret = alpm_option_set_gpgdir(handle, config->gpgdir);
if(ret != 0) {
pm_printf(PM_LOG_ERROR, _("problem setting gpgdir '%s' (%s)\n"),
config->gpgdir, alpm_strerror(alpm_errno(config->handle)));
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index afc79f6f..9ed1c612 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -885,7 +885,7 @@ int main(int argc, char *argv[])
printf("\n");
printf("Lock File : %s\n", alpm_option_get_lockfile(config->handle));
printf("Log File : %s\n", alpm_option_get_logfile(config->handle));
- printf("GPG Dir : %s\n", alpm_option_get_signaturedir(config->handle));
+ printf("GPG Dir : %s\n", alpm_option_get_gpgdir(config->handle));
list_display("Targets :", pm_targets);
}