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

Improve marginally configuring/purging all packages by looking at its

Browse Source 
state in the object dictionary rather than opening and externalizing
the dictionary of every package.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20090821093126-0xw980x0pqtq59q2
This commit is contained in:
Juan RP
2009-08-21 11:31:26 +02:00
parent 4aac305105
commit ecfa25833f
5 changed files with 105 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-bin/install.c
View File

@@ -415,7 +415,7 @@ exec_transaction(struct transaction *trans)
*/
while ((obj = prop_object_iterator_next(trans->iter)) != NULL) {
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
if ((rv = xbps_configure_pkg(pkgname)) != 0) {
if ((rv = xbps_configure_pkg(pkgname, false)) != 0) {
printf("Error configuring package %s (%s)\n",
pkgname, strerror(rv));
return rv;

41
bin/xbps-bin/main.c
View File

@@ -87,9 +87,6 @@ int
main(int argc, char **argv)
{
prop_dictionary_t dict;
prop_object_t obj;
prop_object_iterator_t iter;
const char *curpkgname;
int c, flags = 0, rv = 0;
bool force = false, verbose = false;
@@ -224,21 +221,10 @@ main(int argc, char **argv)
if (argc != 2)
usage();
if (strcasecmp(argv[1], "all") == 0) {
iter = xbps_get_array_iter_from_dict(dict, "packages");
if (iter == NULL)
goto out;
while ((obj = prop_object_iterator_next(iter))) {
prop_dictionary_get_cstring_nocopy(obj,
"pkgname", &curpkgname);
if ((rv = xbps_purge_pkg(curpkgname)) != 0)
break;
}
prop_object_iterator_release(iter);
} else {
rv = xbps_purge_pkg(argv[1]);
}
if (strcasecmp(argv[1], "all") == 0)
rv = xbps_purge_all_pkgs();
else
rv = xbps_purge_pkg(argv[1], true);
} else if (strcasecmp(argv[0], "reconfigure") == 0) {
/*
@@ -247,21 +233,10 @@ main(int argc, char **argv)
if (argc != 2)
usage();
if (strcasecmp(argv[1], "all") == 0) {
iter = xbps_get_array_iter_from_dict(dict, "packages");
if (iter == NULL)
goto out;
while ((obj = prop_object_iterator_next(iter))) {
prop_dictionary_get_cstring_nocopy(obj,
"pkgname", &curpkgname);
if ((rv = xbps_configure_pkg(curpkgname)) != 0)
break;
}
prop_object_iterator_release(iter);
} else {
rv = xbps_configure_pkg(argv[1]);
}
if (strcasecmp(argv[1], "all") == 0)
rv = xbps_configure_all_pkgs();
else
rv = xbps_configure_pkg(argv[1], true);
} else {
usage();