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

xbps-bin: skip packages to be configured in the install/update stage, fix configured pkg count.

Browse Source
This commit is contained in:
Juan RP 2011-02-21 23:28:39 +01:00
parent 511dbffa9e
commit 9e22df0725
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,7 +445,9 @@ exec_transaction(struct transaction *trans)
printf("\n[2/3] Unpacking\n"); printf("\n[2/3] Unpacking\n");
while ((obj = prop_object_iterator_next(trans->iter)) != NULL) { while ((obj = prop_object_iterator_next(trans->iter)) != NULL) {
prop_dictionary_get_cstring_nocopy(obj, "transaction", &tract); prop_dictionary_get_cstring_nocopy(obj, "transaction", &tract);
if (strcmp(tract, "remove") == 0) /* Match only packages to be installed or updated */
if ((strcmp(tract, "remove") == 0) ||
(strcmp(tract, "configure") == 0))
continue; continue;
autoinst = preserve = false; autoinst = preserve = false;
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
@ -528,7 +530,8 @@ exec_transaction(struct transaction *trans)
"package %s (%s)\n", pkgname, strerror(rv)); "package %s (%s)\n", pkgname, strerror(rv));
return rv; return rv;
} }
trans->cf_pkgcnt++; if (strcmp(tract, "configure"))
trans->cf_pkgcnt++;
} }
printf("\nxbps-bin: %zu installed, %zu updated, " printf("\nxbps-bin: %zu installed, %zu updated, "
"%zu configured, %zu removed.\n", trans->inst_pkgcnt, "%zu configured, %zu removed.\n", trans->inst_pkgcnt,