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

xbps-fbulk: simplify recollection of dependencies.

Browse Source 
The changes I made to xbps-src show-build-deps now will print only
real source package names, without version components or virtual packages,
so that fbulk does not do any extra work.
This commit is contained in:
Juan RP 2015-04-26 10:05:56 +02:00
parent 149f48fb8e
commit 93c85e8038
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bin/xbps-fbulk/main.c
View File

@ -481,7 +481,6 @@ ordered_depends(const char *bpath, const char *pkgn)
fp = popen(cmd, "r"); fp = popen(cmd, "r");
while (fgets(buf, sizeof(buf), fp) != NULL) { while (fgets(buf, sizeof(buf), fp) != NULL) {
char *tmp, *tmp2, *depn;
size_t len; size_t len;
/* ignore pkgs returning errors */ /* ignore pkgs returning errors */
@ -494,46 +493,14 @@ ordered_depends(const char *bpath, const char *pkgn)
len = strlen(buf); len = strlen(buf);
if (len && buf[len-1] == '\n') if (len && buf[len-1] == '\n')
buf[--len] = 0; buf[--len] = 0;
/*
* Grab the package name component...
*/
if ((depn = xbps_pkgpattern_name(buf)) == NULL)
if ((depn = xbps_pkg_name(buf)) == NULL)
depn = strdup(buf);
if (VerboseOpt) if (VerboseOpt)
printf("%s: depends on %s\n", pkgn, depn); printf("%s: depends on %s\n", pkgn, buf);
assert(depn); xitem = lookupItem(buf);
/*
* ... and then convert it to the real source package
* (dependency could be a subpackage).
*/
tmp = xbps_xasprintf("%s/srcpkgs/%s", bpath, depn);
if ((tmp2 = realpath(tmp, NULL)) == NULL) {
item->emsg = xbps_xasprintf("unresolved dependency: %s\n", depn);
item->status = XBROKEN;
item->xcode = EXIT_FAILURE;
free(depn);
free(tmp);
break;
}
free(tmp);
free(depn);
tmp = strdup(tmp2);
depn = basename(tmp);
assert(depn);
free(tmp2);
if (VerboseOpt)
printf("%s: dependency transformed to %s\n", pkgn, depn);
xitem = lookupItem(depn);
if (xitem == NULL) if (xitem == NULL)
xitem = ordered_depends(bpath, depn); xitem = ordered_depends(bpath, buf);
addDepn(item, xitem); addDepn(item, xitem);
free(tmp);
} }
pclose(fp); pclose(fp);
free(cmd); free(cmd);