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

xbps-bin: print different msgs for pkgs marked as preserve and essential.

Browse Source 
--HG--
extra : convert_revision : xtraeme%40gmail.com-20100125151648-s3d0zxaro5v5bh95
This commit is contained in:
Juan RP 2010-01-25 16:16:48 +01:00
parent dae134cd48
commit 375330a956
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,14 +285,14 @@ show_transaction_sizes(struct transaction *trans)
"%s\n", strerror(errno)); "%s\n", strerror(errno));
return -1; return -1;
} }
printf("Total download size: %s\n", size); printf("Total download size: %sB\n", size);
if (xbps_humanize_number(size, 5, (int64_t)instsize, if (xbps_humanize_number(size, 5, (int64_t)instsize,
"", HN_AUTOSCALE, HN_B|HN_DECIMAL|HN_NOSPACE) == -1) { "", HN_AUTOSCALE, HN_B|HN_DECIMAL|HN_NOSPACE) == -1) {
fprintf(stderr, "xbps-bin: error: humanize_number2 returns " fprintf(stderr, "xbps-bin: error: humanize_number2 returns "
"%s\n", strerror(errno)); "%s\n", strerror(errno));
return -1; return -1;
} }
printf("Total installed size: %s\n\n", size); printf("Total installed size: %sB\n\n", size);
return 0; return 0;
} }
@ -499,14 +499,14 @@ exec_transaction(struct transaction *trans)
prop_object_iterator_t replaces_iter; prop_object_iterator_t replaces_iter;
const char *pkgname, *version, *pkgver, *instver, *filename, *tract; const char *pkgname, *version, *pkgver, *instver, *filename, *tract;
int rv = 0; int rv = 0;
bool update, essential, autoinst; bool update, essential, preserve, autoinst;
pkg_state_t state = 0; pkg_state_t state = 0;
assert(trans != NULL); assert(trans != NULL);
assert(trans->dict != NULL); assert(trans->dict != NULL);
assert(trans->iter != NULL); assert(trans->iter != NULL);
update = essential = autoinst = false; update = essential = autoinst = preserve = false;
/* /*
* Show download/installed size for the transaction. * Show download/installed size for the transaction.
*/ */
@ -547,6 +547,7 @@ exec_transaction(struct transaction *trans)
return errno; return errno;
prop_dictionary_get_bool(obj, "automatic-install", &autoinst); prop_dictionary_get_bool(obj, "automatic-install", &autoinst);
prop_dictionary_get_bool(obj, "essential", &essential); prop_dictionary_get_bool(obj, "essential", &essential);
prop_dictionary_get_bool(obj, "preserve", &preserve);
if (!prop_dictionary_get_cstring_nocopy(obj, if (!prop_dictionary_get_cstring_nocopy(obj,
"filename", &filename)) "filename", &filename))
return errno; return errno;
@ -601,9 +602,12 @@ exec_transaction(struct transaction *trans)
* is all handled internally in xbps_remove_pkg() * is all handled internally in xbps_remove_pkg()
* and xbps_unpack_binary_pkg(). * and xbps_unpack_binary_pkg().
*/ */
if (essential) if (essential && !preserve)
printf("Replacing %s-%s with %s-%s ...\n", printf("Replacing %s-%s with %s-%s ...\n",
pkgname, instver, pkgname, version); pkgname, instver, pkgname, version);
else if (essential && preserve)
printf("Conserving %s-%s files, installing new "
"version ...\n", pkgname, instver);
else else
printf("Removing %s-%s before installing new " printf("Removing %s-%s before installing new "
"version ...\n", pkgname, instver); "version ...\n", pkgname, instver);