mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-02 00:25:07 -04:00
Add a default cachedir if one wasn't specified
Use the default cachedir (specified at compile time) if one wasn't specified on the command line or in the config file. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
c22e381a8b
commit
d09d114e99
@ -1,6 +1,7 @@
|
||||
# paths set at make time
|
||||
conffile = ${sysconfdir}/pacman.conf
|
||||
dbpath = ${localstatedir}/lib/pacman/
|
||||
cachedir = ${localstatedir}/cache/pacman/pkg/
|
||||
|
||||
bin_PROGRAMS = pacman pacman.static
|
||||
|
||||
@ -8,6 +9,7 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \
|
||||
-DCONFFILE=\"$(conffile)\" \
|
||||
-DROOTDIR=\"$(ROOTDIR)\" \
|
||||
-DDBPATH=\"$(dbpath)\" \
|
||||
-DCACHEDIR=\"$(cachedir)\" \
|
||||
@DEFS@
|
||||
INCLUDES = -I$(top_srcdir)/lib/libalpm
|
||||
|
||||
|
@ -767,6 +767,11 @@ int main(int argc, char *argv[])
|
||||
cleanup(ret);
|
||||
}
|
||||
|
||||
/* add a default cachedir if one wasn't specified */
|
||||
if(alpm_option_get_cachedirs() == NULL) {
|
||||
alpm_option_add_cachedir(CACHEDIR);
|
||||
}
|
||||
|
||||
#if defined(HAVE_GETEUID)
|
||||
/* check if we have sufficient permission for the requested operation */
|
||||
if(myuid > 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user