Get rid of system virtualpkg.d support (<prefix>/share/xbps/virtualpkg.d).

Binary packages do not need to provide those virtualpkg configuration files
anymore; all vpkg info is now collected from pkgdb.
This commit is contained in:
Juan RP
2014-11-04 11:17:27 +01:00
parent 59781f4e91
commit 595136704e
6 changed files with 79 additions and 21 deletions

View File

@ -298,6 +298,8 @@ parse_dir(struct xbps_handle *xhp, const char *cwd, const char *dir, const char
char *ext, ldir[PATH_MAX], conf[PATH_MAX];
int i, n, rv = 0;
if (dir == NULL)
goto stage2;
/*
* Read all configuration files stored in the system
* foo.d directory.
@ -344,6 +346,9 @@ parse_dir(struct xbps_handle *xhp, const char *cwd, const char *dir, const char
return rv;
stage2:
if (confdir == NULL)
return rv;
/*
* Read all configuration files stored in the configuration foo.d directory.
*/
@ -443,7 +448,7 @@ xbps_init(struct xbps_handle *xhp)
free(buf);
}
/* process virtualpkg.d dirs */
if ((rv = parse_dir(xhp, cwd, XBPS_SYS_VPKG_PATH, XBPS_VPKG_PATH, true)) != 0)
if ((rv = parse_dir(xhp, cwd, NULL, XBPS_VPKG_PATH, true)) != 0)
return rv;
/* process repo.d dirs */