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

xbps-bin: skip some unneeded stuff in the download and configure phases.

Browse Source
This commit is contained in:
Juan RP 2011-02-23 23:43:45 +01:00
parent d357dfed90
commit 5f2ae48b71
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ download_package_list(prop_object_iterator_t iter, bool only_show)
{ {
const struct xbps_handle *xhp; const struct xbps_handle *xhp;
prop_object_t obj; prop_object_t obj;
const char *pkgver, *repoloc, *filename, *sha256; const char *pkgver, *repoloc, *filename, *sha256, *trans;
char *binfile; char *binfile;
int rv = 0; int rv = 0;
bool cksum; bool cksum;
@ -103,6 +103,11 @@ download_package_list(prop_object_iterator_t iter, bool only_show)
xhp = xbps_handle_get(); xhp = xbps_handle_get();
again: again:
while ((obj = prop_object_iterator_next(iter)) != NULL) { while ((obj = prop_object_iterator_next(iter)) != NULL) {
prop_dictionary_get_cstring_nocopy(obj, "transaction", &trans);
if ((strcmp(trans, "remove") == 0) ||
(strcmp(trans, "configure") == 0))
continue;
cksum = false; cksum = false;
prop_dictionary_get_bool(obj, "checksum_ok", &cksum); prop_dictionary_get_bool(obj, "checksum_ok", &cksum);
if (cksum == true) if (cksum == true)
@ -548,7 +553,8 @@ exec_transaction(struct transaction *trans)
printf("\n[*] Configuring packages installed/updated ...\n"); printf("\n[*] Configuring packages installed/updated ...\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) if ((strcmp(tract, "remove") == 0) ||
(strcmp(tract, "configure") == 0))
continue; continue;
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version); prop_dictionary_get_cstring_nocopy(obj, "version", &version);
@ -561,8 +567,7 @@ exec_transaction(struct transaction *trans)
"package %s (%s)\n", pkgname, strerror(rv)); "package %s (%s)\n", pkgname, strerror(rv));
return rv; return rv;
} }
if (strcmp(tract, "configure")) trans->cf_pkgcnt++;
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,