bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added a default cachedir

Browse source
This commit is contained in:
Judd Vinet 2005-10-20 20:44:14 +00:00
parent 86ec3a2ad7
commit feb152d78c
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/pacman/conf.c
View file

@ -35,6 +35,7 @@
#define min(X, Y) ((X) < (Y) ? (X) : (Y)) #define min(X, Y) ((X) < (Y) ? (X) : (Y))
extern char *pmo_dbpath; extern char *pmo_dbpath;
extern char *pmo_cachedir;
extern list_t *pmo_holdpkg; extern list_t *pmo_holdpkg;
extern char *pmo_proxyhost; extern char *pmo_proxyhost;
extern unsigned short pmo_proxyport; extern unsigned short pmo_proxyport;
@ -214,6 +215,14 @@ int parseconfig(char *file)
FREE(pmo_dbpath); FREE(pmo_dbpath);
pmo_dbpath = strdup(ptr); pmo_dbpath = strdup(ptr);
vprint("config: dbpath: %s\n", ptr); vprint("config: dbpath: %s\n", ptr);
} else if(!strcmp(key, "CACHEDIR")) {
/* shave off the leading slash, if there is one */
if(*ptr == '/') {
ptr++;
}
FREE(pmo_cachedir);
pmo_cachedir = strdup(ptr);
vprint("config: cachedir: %s\n", ptr);
} else if (!strcmp(key, "LOGFILE")) { } else if (!strcmp(key, "LOGFILE")) {
if(alpm_set_option(PM_OPT_LOGFILE, (long)ptr) == -1) { if(alpm_set_option(PM_OPT_LOGFILE, (long)ptr) == -1) {
ERR(NL, "failed to set option LOGFILE (%s)\n", alpm_strerror(pm_errno)); ERR(NL, "failed to set option LOGFILE (%s)\n", alpm_strerror(pm_errno));

8
src/pacman/pacman.c
View file

@ -51,6 +51,7 @@
/* command line options */ /* command line options */
char *pmo_root = NULL; char *pmo_root = NULL;
char *pmo_dbpath = NULL; char *pmo_dbpath = NULL;
char *pmo_cachedir = NULL;
char *pmo_configfile = NULL; char *pmo_configfile = NULL;
unsigned short pmo_op = PM_OP_MAIN; unsigned short pmo_op = PM_OP_MAIN;
unsigned short pmo_verbose = 0; unsigned short pmo_verbose = 0;
@ -174,6 +175,9 @@ int main(int argc, char *argv[])
if(pmo_dbpath == NULL) { if(pmo_dbpath == NULL) {
pmo_dbpath = strdup("var/lib/pacman"); pmo_dbpath = strdup("var/lib/pacman");
} }
if(pmo_cachedir == NULL) {
pmo_cachedir = strdup("var/cache/pacman");
}
/* set library parameters */ /* set library parameters */
if(alpm_set_option(PM_OPT_LOGMASK, (long)pmo_debug) == -1) { if(alpm_set_option(PM_OPT_LOGMASK, (long)pmo_debug) == -1) {
@ -188,6 +192,10 @@ int main(int argc, char *argv[])
ERR(NL, "failed to set option DBPATH (%s)\n", alpm_strerror(pm_errno)); ERR(NL, "failed to set option DBPATH (%s)\n", alpm_strerror(pm_errno));
cleanup(1); cleanup(1);
} }
if(alpm_set_option(PM_OPT_CACHEDIR, (long)pmo_cachedir) == -1) {
ERR(NL, "failed to set option CACHEDIR (%s)\n", alpm_strerror(pm_errno));
cleanup(1);
}
if(pmo_verbose > 1) { if(pmo_verbose > 1) {
printf("Root : %s\n", pmo_root); printf("Root : %s\n", pmo_root);