packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull: Distingiush delta pulls from loose better

This commit is contained in:
Colin Walters 2015-01-21 09:13:12 -05:00
parent 549f1ec7df
commit e40b86221a
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libostree/ostree-repo-pull.c
View File

@ -2025,22 +2025,28 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (bytes_transferred > 0 && pull_data->progress) if (bytes_transferred > 0 && pull_data->progress)
{ {
guint shift; guint shift;
gs_free char *msg = NULL; GString *buf = g_string_new ("");
if (bytes_transferred < 1024) if (bytes_transferred < 1024)
shift = 1; shift = 1;
else else
shift = 1024; shift = 1024;
msg = g_strdup_printf ("%u metadata, %u content objects fetched; %" G_GUINT64_FORMAT " %s; %u delta parts fetched, " if (pull_data->n_fetched_deltaparts > 0)
"transferred in %u seconds", g_string_append_printf (buf, "%u delta parts, %u loose fetched",
pull_data->n_fetched_metadata, pull_data->n_fetched_content, pull_data->n_fetched_deltaparts,
(guint64)(bytes_transferred / shift), pull_data->n_fetched_metadata + pull_data->n_fetched_content);
shift == 1 ? "B" : "KiB", else
pull_data->n_fetched_deltaparts, g_string_append_printf (buf, "%u metadata, %u content objects fetched",
(guint) ((end_time - pull_data->start_time) / G_USEC_PER_SEC)); pull_data->n_fetched_metadata, pull_data->n_fetched_content);
ostree_async_progress_set_status (pull_data->progress, msg); g_string_append_printf (buf, "; %" G_GUINT64_FORMAT " %s transferred in %u seconds",
(guint64)(bytes_transferred / shift),
shift == 1 ? "B" : "KiB",
(guint) ((end_time - pull_data->start_time) / G_USEC_PER_SEC));
ostree_async_progress_set_status (pull_data->progress, buf->str);
g_string_free (buf, TRUE);
} }
/* iterate over commits fetched and delete any commitpartial files */ /* iterate over commits fetched and delete any commitpartial files */