emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It's now possible to set rootdir, cachedir, and fetch caches in the conf file.

Browse Source
This commit is contained in:
Juan RP 2011-06-04 17:08:44 +02:00
parent 48f689d8e6
commit 5a355ed6d9
2 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etc/xbps-conf.plist
View File

@ -2,6 +2,23 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<!-- Default root directory, defaults to / -->
<key>root-directory</key>
<string>/</string>
<!-- Default cache directory to store downloaded binary packages -->
<key>cache-directory</key>
<string>/var/cache/xbps</string>
<!-- Default global limit of cached connections when fetching -->
<key>fetch-cache-connections</key>
<integer>10</integer>
<!-- Default per-host limit of cached connections when fetching -->
<key>fetch-cache-connections-per-host</key>
<integer>6</integer>
<!-- Repository list -->
<key>repositories</key> <key>repositories</key>
<array> <array>
<!-- You can specify here your list of repositories, <!-- You can specify here your list of repositories,
@ -19,6 +36,8 @@
the path to the directory. --> the path to the directory. -->
<string>http://xbps.nopcode.org/repos/stable</string> <string>http://xbps.nopcode.org/repos/stable</string>
</array> </array>
<!-- Virtual packages -->
<key>package-virtual</key> <key>package-virtual</key>
<array> <array>
<!-- This dictionary sets that we _always_ want <!-- This dictionary sets that we _always_ want

59
lib/initend.c
View File

@ -45,28 +45,19 @@ static struct xbps_handle *xhp;
int int
xbps_init(struct xbps_handle *xh) xbps_init(struct xbps_handle *xh)
{ {
const char *conf_rootdir = NULL, *conf_cachedir = NULL;
uint16_t fetch_cache_conn = 0, fetch_cache_conn_host = 0;
int rv; int rv;
assert(xh != NULL); assert(xh != NULL);
xhp = xh; xhp = xh;
debug = xhp->with_debug; debug = xhp->with_debug;
xbps_fetch_set_cache_connection(XBPS_FETCH_CACHECONN,
XBPS_FETCH_CACHECONN_HOST);
/* If rootdir not set, defaults to '/' */
if (xhp->rootdir == NULL)
xhp->rootdir = "/";
/* If cachedir not set, defaults to XBPS_CACHE_PATH */
if (xhp->cachedir == NULL)
xhp->cachedir = XBPS_CACHE_PATH;
/* If conffile not set, defaults to XBPS_CONF_PATH */ /* If conffile not set, defaults to XBPS_CONF_PATH */
if (xhp->conffile == NULL) if (xhp->conffile == NULL)
xhp->conffile = XBPS_CONF_PATH "/" XBPS_CONF_PLIST; xhp->conffile = XBPS_CONF_PATH "/" XBPS_CONF_PLIST;
xbps_dbg_printf("%s: rootdir: %s cachedir: %s conf: %s\n", __func__,
xhp->rootdir, xhp->cachedir, xhp->conffile);
/* /*
* Internalize the XBPS_CONF_PLIST dictionary. * Internalize the XBPS_CONF_PLIST dictionary.
*/ */
@ -81,7 +72,53 @@ xbps_init(struct xbps_handle *xh)
} }
xbps_dbg_printf("%s: conf_dictionary not internalized.\n", xbps_dbg_printf("%s: conf_dictionary not internalized.\n",
__func__); __func__);
} else {
/*
* Get defaults from configuration file.
*/
prop_dictionary_get_cstring_nocopy(xhp->conf_dictionary,
"root-directory", &conf_rootdir);
prop_dictionary_get_cstring_nocopy(xhp->conf_dictionary,
"cache-directory", &conf_cachedir);
prop_dictionary_get_uint16(xhp->conf_dictionary,
"fetch-cache-connections", &fetch_cache_conn);
prop_dictionary_get_uint16(xhp->conf_dictionary,
"fetch-cache-connections-per-host", &fetch_cache_conn_host);
} }
/*
* Client supplied values in xbps_handle will be choosen over the
* same values in configuration file. If not specified, use defaults.
*/
if (xhp->rootdir == NULL) {
if (conf_rootdir != NULL)
xhp->rootdir = conf_rootdir;
else {
/* If rootdir not set, defaults to '/' */
xhp->rootdir = "/";
}
}
if (xhp->cachedir == NULL) {
if (conf_cachedir != NULL)
xhp->cachedir = conf_cachedir;
else {
/* If cachedir not set, defaults to XBPS_CACHE_PATH */
xhp->cachedir = XBPS_CACHE_PATH;
}
}
if (fetch_cache_conn == 0)
fetch_cache_conn = XBPS_FETCH_CACHECONN;
if (fetch_cache_conn_host != 0)
fetch_cache_conn_host = XBPS_FETCH_CACHECONN_HOST;
xbps_fetch_set_cache_connection(fetch_cache_conn,
fetch_cache_conn_host);
xbps_dbg_printf("%s: rootdir: `%s' cachedir: `%s' conf: `%s'\n",
__func__, xhp->rootdir, xhp->cachedir, xhp->conffile);
xbps_dbg_printf("%s: fetch_cache_conn: %zu fetch_cache_host: %zu\n",
__func__, fetch_cache_conn, fetch_cache_conn_host);
/* /*
* Initialize repository pool. * Initialize repository pool.
*/ */