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

xbps_find_pkg_orphans: also take into account virtual pkgs.

Browse Source
This commit is contained in:
Juan RP 2014-09-05 13:10:50 +02:00
parent bf92d1f5a3
commit 685a85a466
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/package_orphans.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2009-2013 Juan Romero Pardines. * Copyright (c) 2009-2014 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -122,7 +122,8 @@ find_orphans:
for (unsigned int x = 0; x < xbps_array_count(rdeps); x++) { for (unsigned int x = 0; x < xbps_array_count(rdeps); x++) {
cnt = 0; cnt = 0;
xbps_array_get_cstring_nocopy(rdeps, x, &deppkgver); xbps_array_get_cstring_nocopy(rdeps, x, &deppkgver);
if (xbps_find_pkg_in_array(array, deppkgver)) if (xbps_find_pkg_in_array(array, deppkgver) ||
xbps_find_virtualpkg_in_array(xhp, array, deppkgver))
continue; continue;
reqby = xbps_pkgdb_get_pkg_revdeps(xhp, deppkgver); reqby = xbps_pkgdb_get_pkg_revdeps(xhp, deppkgver);
if (reqby == NULL) if (reqby == NULL)
@ -130,7 +131,8 @@ find_orphans:
reqbycnt = xbps_array_count(reqby); reqbycnt = xbps_array_count(reqby);
for (unsigned int j = 0; j < reqbycnt; j++) { for (unsigned int j = 0; j < reqbycnt; j++) {
xbps_array_get_cstring_nocopy(reqby, j, &reqbydep); xbps_array_get_cstring_nocopy(reqby, j, &reqbydep);
if (xbps_find_pkg_in_array(array, reqbydep)) if (xbps_find_pkg_in_array(array, reqbydep) ||
xbps_find_virtualpkg_in_array(xhp, array, reqbydep))
cnt++; cnt++;
} }
if (cnt == reqbycnt) { if (cnt == reqbycnt) {