FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 06-01-2011, 08:03 PM
Kerrick Staley
 
Default Changed 'signaturedir' to 'gpgdir' in libalpm symbols. Signed-off-by: Kerrick Staley

---
lib/libalpm/alpm.h | 4 ++--
lib/libalpm/handle.c | 18 +++++++++---------
lib/libalpm/handle.h | 2 +-
lib/libalpm/signing.c | 4 ++--
src/pacman/conf.c | 2 +-
src/pacman/pacman.c | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index c779a06..62a8f09 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -198,9 +198,9 @@ int alpm_option_set_logfile(const char *logfile);
const char *alpm_option_get_lockfile(void);

/** Returns the signature directory path. */
-const char *alpm_option_get_signaturedir(void);
+const char *alpm_option_get_gpgdir(void);
/** Sets the signature directory path. */
-int alpm_option_set_signaturedir(const char *signaturedir);
+int alpm_option_set_gpgdir(const char *gpgdir);

/** Returns whether to use syslog (0 is FALSE, TRUE otherwise). */
int alpm_option_get_usesyslog(void);
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 4999244..04656b4 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -82,7 +82,7 @@ void _alpm_handle_free(pmhandle_t *handle)
FREE(handle->logfile);
FREE(handle->lockfile);
FREE(handle->arch);
- FREE(handle->signaturedir);
+ FREE(handle->gpgdir);
FREELIST(handle->dbs_sync);
FREELIST(handle->noupgrade);
FREELIST(handle->noextract);
@@ -173,13 +173,13 @@ const char SYMEXPORT *alpm_option_get_lockfile()
return handle->lockfile;
}

-const char SYMEXPORT *alpm_option_get_signaturedir()
+const char SYMEXPORT *alpm_option_get_gpgdir()
{
if(handle == NULL) {
pm_errno = PM_ERR_HANDLE_NULL;
return NULL;
}
- return handle->signaturedir;
+ return handle->gpgdir;
}

int SYMEXPORT alpm_option_get_usesyslog()
@@ -468,21 +468,21 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
return 0;
}

-int SYMEXPORT alpm_option_set_signaturedir(const char *signaturedir)
+int SYMEXPORT alpm_option_set_gpgdir(const char *gpgdir)
{
ALPM_LOG_FUNC;

- if(!signaturedir) {
+ if(!gpgdir) {
pm_errno = PM_ERR_WRONG_ARGS;
return -1;
}

- if(handle->signaturedir) {
- FREE(handle->signaturedir);
+ if(handle->gpgdir) {
+ FREE(handle->gpgdir);
}
- handle->signaturedir = strdup(signaturedir);
+ handle->gpgdir = strdup(gpgdir);

- _alpm_log(PM_LOG_DEBUG, "option 'signaturedir' = %s
", handle->signaturedir);
+ _alpm_log(PM_LOG_DEBUG, "option 'gpgdir' = %s
", handle->gpgdir);
return 0;
}

diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index 5bd41f1..616c9fd 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -58,7 +58,7 @@ typedef struct _pmhandle_t {
char *dbpath; /* Base path to pacman's DBs */
char *logfile; /* Name of the log file */
char *lockfile; /* Name of the lock file */
- char *signaturedir; /* Directory where GnuPG files are stored */
+ char *gpgdir; /* Directory where GnuPG files are stored */
alpm_list_t *cachedirs; /* Paths to pacman cache directories */

/* package lists */
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 1a99c8f..fd13549 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -118,7 +118,7 @@ static int gpgme_init(void)
return 0;
}

- if(!alpm_option_get_signaturedir()) {
+ if(!alpm_option_get_gpgdir()) {
RET_ERR(PM_ERR_SIG_MISSINGDIR, 1);
}

@@ -144,7 +144,7 @@ static int gpgme_init(void)

/* set and check engine information */
err = gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP, NULL,
- alpm_option_get_signaturedir());
+ alpm_option_get_gpgdir());
CHECK_ERR();
err = gpgme_get_engine_info(&enginfo);
CHECK_ERR();
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index a872d3f..0dbbfea 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -466,7 +466,7 @@ static int setlibpaths(void)
/* Set GnuPG's home directory. This is not relative to rootdir, even if
* rootdir is defined. Reasoning: gpgdir contains configuration data. */
if(config->gpgdir) {
- ret = alpm_option_set_signaturedir(config->gpgdir);
+ ret = alpm_option_set_gpgdir(config->gpgdir);
if(ret != 0) {
pm_printf(PM_LOG_ERROR, _("problem setting gpgdir '%s' (%s)
"),
config->gpgdir, alpm_strerrorlast());
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 8458c97..810f335 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -813,7 +813,7 @@ int main(int argc, char *argv[])
/* define paths to reasonable defaults */
alpm_option_set_root(ROOTDIR);
alpm_option_set_dbpath(DBPATH);
- alpm_option_set_signaturedir(GPGDIR);
+ alpm_option_set_gpgdir(GPGDIR);
alpm_option_set_logfile(LOGFILE);

/* Priority of options:
--
1.7.5.2
 

Thread Tools




All times are GMT. The time now is 09:57 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org