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

Revert "xbps_match_any_virtualpkg_in_rundeps: break correctly from inner loop on match."

Browse Source 
This reverts commit 31b1975b1e.

Revert experimental changes to repository_finddeps.c.
This commit is contained in:
Juan RP 2012-03-11 17:16:58 +01:00
parent 31b1975b1e
commit ca03127a82
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/plist_match.c
View File

@ -74,10 +74,10 @@ xbps_match_any_virtualpkg_in_rundeps(prop_array_t rundeps,
found = true; found = true;
break; break;
} }
}
if (found) if (found)
break; break;
} }
}
return found; return found;
} }

44
lib/repository_finddeps.c
View File

@ -292,18 +292,15 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
if (rv == 0) { if (rv == 0) {
/* /*
* Package is installed but does not match * Package is installed but does not match
* the dependency pattern, update pkg. * the dependency pattern.
*/ */
xbps_dbg_printf_append("installed `%s', "
"must be updated.\n", pkgver_q);
reason = "update";
} else if (rv == 1) { } else if (rv == 1) {
rv = 0; rv = 0;
if (state == XBPS_PKG_STATE_UNPACKED) { if (state == XBPS_PKG_STATE_UNPACKED) {
/* /*
* Package matches the dependency * Package matches the dependency
* pattern but was only unpacked, * pattern but was only unpacked,
* configure pkg. * mark pkg to be configured.
*/ */
xbps_dbg_printf_append("installed `%s'" xbps_dbg_printf_append("installed `%s'"
", must be configured.\n", ", must be configured.\n",
@ -313,7 +310,7 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
/* /*
* Package matches the dependency * Package matches the dependency
* pattern and is fully installed, * pattern and is fully installed,
* skip to next one. * skip and pass to next one.
*/ */
xbps_dbg_printf_append("installed " xbps_dbg_printf_append("installed "
"`%s'.\n", pkgver_q); "`%s'.\n", pkgver_q);
@ -402,8 +399,41 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
} }
} }
} }
prop_dictionary_set_cstring_nocopy(curpkgd, "transaction", reason); /*
* Pass 4: check if new dependency is already installed, due
* to virtual packages.
*/
prop_dictionary_get_cstring_nocopy(curpkgd, "pkgver", &pkgver_q); prop_dictionary_get_cstring_nocopy(curpkgd, "pkgver", &pkgver_q);
tmpd = xbps_find_pkg_dict_installed(pkgver_q, true);
if (tmpd == NULL)
tmpd = xbps_find_virtualpkg_dict_installed(pkgver_q, true);
if (tmpd == NULL) {
/* dependency not installed */
reason = "install";
xbps_dbg_printf_append("(found `%s')\n",
pkgver_q);
} else {
/* dependency installed, check its state */
state = 0;
if ((rv = xbps_pkg_state_dictionary(tmpd, &state)) != 0) {
prop_object_release(tmpd);
xbps_dbg_printf("failed to check pkg state "
"for `%s': %s\n", pkgver_q, strerror(rv));
break;
}
if (state == XBPS_PKG_STATE_INSTALLED) {
reason = "update";
xbps_dbg_printf_append("(found `%s')\n",
pkgver_q);
} else if (state == XBPS_PKG_STATE_UNPACKED) {
reason = "install";
xbps_dbg_printf_append("(found `%s')\n",
pkgver_q);
}
prop_object_release(tmpd);
}
prop_dictionary_set_cstring_nocopy(curpkgd, "transaction", reason);
/* /*
* Package is on repo, add it into the transaction dictionary. * Package is on repo, add it into the transaction dictionary.
*/ */