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

pull: Don't print, just use progress callback 

More work on removing g_print() from the library.
This commit is contained in:
Colin Walters 2014-03-21 14:52:56 -04:00
parent 44c386c8f9
commit a80872afa0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1230,7 +1230,7 @@ ostree_repo_pull (OstreeRepo *self,
end_time = g_get_monotonic_time (); end_time = g_get_monotonic_time ();
bytes_transferred = ostree_fetcher_bytes_transferred (pull_data->fetcher); bytes_transferred = ostree_fetcher_bytes_transferred (pull_data->fetcher);
if (bytes_transferred > 0) if (bytes_transferred > 0 && pull_data->progress)
{ {
guint shift; guint shift;
gs_free char *msg = NULL; gs_free char *msg = NULL;
@ -1245,10 +1245,7 @@ ostree_repo_pull (OstreeRepo *self,
(guint64)(bytes_transferred / shift), (guint64)(bytes_transferred / shift),
shift == 1 ? "B" : "KiB", shift == 1 ? "B" : "KiB",
(guint) ((end_time - start_time) / G_USEC_PER_SEC)); (guint) ((end_time - start_time) / G_USEC_PER_SEC));
if (pull_data->progress) ostree_async_progress_set_status (pull_data->progress, msg);
ostree_async_progress_set_status (pull_data->progress, msg);
else
g_print ("%s\n", msg);
} }
ret = TRUE; ret = TRUE;