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

New configuration schemas changes, round 3.

Browse Source 
struct xbps_handle::conffile has been renamed to confdir, and it now
expects the path to a directory, where the configuration files are
stored.

Change xbps-bin(8) and xbps-repo(8) along with its manpages to mention
that -C expects a directory.
This commit is contained in:
Juan RP
2011-10-17 15:11:54 +02:00
parent c285afebdc
commit 931a03b806
9 changed files with 94 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/xbps-uhelper/main.c
View File

@ -113,7 +113,7 @@ main(int argc, char **argv)
struct xbps_handle *xhp;
struct xferstat xfer;
prop_dictionary_t dict;
const char *version, *rootdir = NULL, *conffile = NULL;
const char *version, *rootdir = NULL, *confdir = NULL;
char *plist, *pkgname, *pkgver, *in_chroot_env, *hash;
bool debug = false, in_chroot = false;
int i, c, rv = 0;
@ -121,7 +121,7 @@ main(int argc, char **argv)
while ((c = getopt(argc, argv, "C:dr:V")) != -1) {
switch (c) {
case 'C':
conffile = optarg;
confdir = optarg;
break;
case 'r':
/* To specify the root directory */
@ -158,8 +158,8 @@ main(int argc, char **argv)
xhp->xfcd->cookie = &xfer;
if (rootdir)
xhp->rootdir = prop_string_create_cstring(rootdir);
if (conffile)
xhp->conffile = prop_string_create_cstring(conffile);
if (confdir)
xhp->confdir = prop_string_create_cstring(confdir);
if ((rv = xbps_init(xhp)) != 0) {
xbps_error_printf("xbps-uhelper: failed to "