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

Make xbps_(un)register_pkg() accept a boolean arg to flush regpkgdb on success.

Browse Source
This commit is contained in:
Juan RP
2011-12-28 05:57:04 +01:00
parent 11ca929985
commit a7f3a56e19
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/package_register.c
View File

@@ -40,11 +40,11 @@
*/
int
xbps_register_pkg(prop_dictionary_t pkgrd)
xbps_register_pkg(prop_dictionary_t pkgrd, bool flush)
{
struct xbps_handle *xhp;
prop_dictionary_t pkgd;
prop_array_t provides, reqby, array;
prop_dictionary_t pkgd = NULL;
prop_array_t provides, reqby;
const char *pkgname, *version, *desc, *pkgver;
int rv = 0;
bool autoinst = false;
@@ -116,12 +116,6 @@ xbps_register_pkg(prop_dictionary_t pkgrd)
goto out;
}
}
array = prop_dictionary_get(xhp->regpkgdb, "packages");
rv = xbps_array_replace_dict_by_name(array, pkgd, pkgname);
if (rv != 0) {
prop_object_release(pkgd);
goto out;
}
/*
* Add the requiredby objects for dependent packages.
*/
@@ -131,9 +125,13 @@ xbps_register_pkg(prop_dictionary_t pkgrd)
goto out;
}
}
prop_object_release(pkgd);
if (flush)
rv = xbps_regpkgdb_update(xhp, true);
out:
if (pkgd != NULL)
prop_object_release(pkgd);
if (rv != 0) {
xbps_set_cb_state(XBPS_STATE_REGISTER_FAIL,
rv, pkgname, version,
@@ -145,27 +143,25 @@ out:
}
int
xbps_unregister_pkg(const char *pkgname, const char *version)
xbps_unregister_pkg(const char *pkgname, const char *version, bool flush)
{
struct xbps_handle *xhp;
int rv;
assert(pkgname != NULL);
xhp = xbps_handle_get();
if ((rv = xbps_regpkgdb_dictionary_init(xhp)) != 0)
return rv;
xbps_set_cb_state(XBPS_STATE_UNREGISTER, 0, pkgname, version, NULL);
if (!xbps_remove_pkg_from_dict_by_name(xhp->regpkgdb,
"packages", pkgname)) {
if (!xbps_regpkgdb_remove_pkgd(pkgname)) {
xbps_set_cb_state(XBPS_STATE_UNREGISTER_FAIL,
errno, pkgname, version,
"%s: failed to unregister package: %s",
pkgname, strerror(errno));
return errno;
}
if (flush) {
xhp = xbps_handle_get();
return xbps_regpkgdb_update(xhp, true);
}
return 0;
}